#31 removing hard-code pub-sub support.