removed the events call to uninit events
Merge commit 'HEAD@{1}'