Use async pub/sub instead of my homegrown version
Tidy up debug message