Removed ListenerWrapper and merged functionality into Listener.