removing deprecated code.