Added more Clean_up