remove additional handler define