Just some more cleanup
more cleanup