Remove fail-safe

feels good man
Small fixes