Fixed clean_up method