Replaced unnecessary cleans with validators