remove unecessary handler