remove unneeded handler