Refactoring

Cleaned up excessive controllers/classes

Merge request reports

Loading