added clean_up flag