some cleanup
more cleanup