Remove needless goto