===> Cleaning for rates-0.7.0