Add some cleaning steps