Remove references to mubsub