Cleanup classes/functions/headers deprecated before release 3.3