removed some unnecessary classes