===> Cleaning for sunbird-0.9