===> Cleaning for fdm-1.6