more cleanup
more cleanup
weird stuff