Removing deprecated code