Remove PubSub.on and used PubSub.listenTo