Remove unused event handling