Update handlers with new event kwargs

In many cases, the handlers weren't actually using some
of the kwargs so it was just removing unused params in handlers.
Remove unused imports and vars in handlers

Just some code cleanup in the handlers I was modifying
for the event kwargs changes.
Merge branch 'event-args-remove' into develop

* event-args-remove:
  Remove unused imports and vars in handlers
  Update handlers with new event kwargs