===> Cleaning for fdm-2.1