Cleanup

Misc cleanups