Remove non-needed events
Remove useless commented block