Change to leave event handlers in place