Remove preDispatchEventHandler and postDispatchEventHandler,