Removed some unnecessary classes