Project Cleanup
Revert "Project Cleanup"

This reverts commit 96f7c9f4717b0ba9555f4f0ffc0f22b7350846b0.
Revert "Revert "Project Cleanup""

This reverts commit d3dde23f69e2975579feb7a72dcf310753f1dae8.
Project Cleanup