More unnecessary classes removed