some cleanup
misc cleanup