removed router, added pubsub cherry