Removed unnecessary Enrichment classes
FORGE-908