follow up cleaning and fixing