Remove on_clean_up property