fixups
Merge branch 'Massive-Cleanup'