Removing deprecated code refs.