===> Cleaning for mtm-1.2.1