merged with clean_up