get rid of unneeded handler