remove subId from pub sub and remove pubsub.js