Remove unnecessary handler