distributor: remove deprecated code