Revert "Rape and Pillage of Classes"

This reverts commit 058b33eb39fa5cff48729bf3b606adc953a0a26f.
second final