Misc cleanup
Misc cleanup