This is never used.
Moving the relevant pieces together, instead of named handlers elsewhere causing lots of scrolling.
Consistent naming.
Getting rid of stored deferreds in pubsub server.