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