REFACTORING - rename_to_clean_done