Cleanup, punt on event handling