Made some cleaning steps