Revert "Brought back OnCleanup event handler"

This reverts commit c705503a9811ee5e1d0784d8ba2bc62eede02742.