Remove unneeded event handler