Removed autopublish, created pub-sub