removed a few unnecessary classes