===> Cleaning for omega-2.0.5