more cleanup
more misc cleanup