UHM-980 - Removed some definitions from EncounterDataLibrary after moving them to the core reporting module in REPORT-597