Removed the deprecated code