DEVIDM-58: Removed more references to EnrollmentFacade