removing deprecated code and tests