Add event handler clean up.