Code Cleanup: AcademicYears cleaned