and more cleanup