Removing the listener/emiter of #120