Add EventMapping to cleanup