added more cleanup steps