remove commented deprecated code