Some unnecessary classes removed.