===> Cleaning for rates-0.2.0