remove the deprecated code