Cleanup: Removes unused injected Models, Design Fixes.