introducing some bugs
Remove events cancel