misc cleanup

misc cleanup