removed router spec, fixed clear of pubsub