Remove some more failure