ivory fix: remove deprecated code that shouldn't have been around anyway