move client state logic to entry, remove pubsub service