#8 Codebase Cleanup