assorted cleanup
more cleanup