Removed 2 unnecessary classes