Remove use of the todo macro in event handling and add a comment about it being a todo

Remove use of the todo macro in event handling and add a comment about it being a todo #533