===> Cleaning for simp-3.10.0