Removed unnecessary classes due to updated UML model!