Remove commented code
Replace pubsub with Rx.Subject