Removing deprecated class/functions marked for deprecation in 3.0/3.1

Clean out all the old junk in preparation for 3.2! Yay!