some more cleanup
some more cleanup