Remove pre-3.2 deprecated classes and methods

Issue: SPR-12578