unnecessary handler removed