Revert "Class Selection"

This reverts commit d2ae745917fba540d3761602f8dd8dc4971001a3.
Complete GM