Add the new remainder_clean handler