pub-sub topics are now optional, cleanup
cleanup