Cleanup first wave
Merge branch 'refs/heads/Project-Cleanup'