remove unused listener and it's event model