removed unnecessary pubsub implementation