===> Cleaning for courier-1.3.5