Ed: moved the stop_delete to the end, tests pass
Ed: remove stop_to_delete from adapted
Merge pull request #640 from l-vincent-l/clean_adapted

Clean adapted