Misc cleanups
Misc cleanups