Cleaning out deprecations (when deployment OS is 7.1)