add more cleanup