Fixes event removal

Previously event removal wasn't actually removing events.  Instead is was calling each handler once with no arguments.