===> Cleaning for simp-3.6.1