Removed classes
Merge pull request #2549 from ten24/feature-4-removeClasses

Removed classes