unnecessary classes removed