remove dead code
Make pub_sub functionality opt-in