Get rid of pointless handler