adding more cleanup