adding cleanup first step