wip rewrite removePublished in terms of addPublished and removeBuffered