Removed default events + corrected stupid bug

Signed-off-by: Fabien Gaud <fgaud@sfu.ca>