a more cleanup