Removed unnecessary classes from reports/domain