Remove fail handler