Sprint 3 Cleanup