Removed the unneeded handler