Remove previously deprecated code, enable new deprecations