[PubSub] remove now unused code to complete migration