Sprint 4 Cleanup