all unnecessary classes removed