Fixed clean_up