even more cleanup