Cleaning up some deprecations when the deployment target is 7.1