removed goto code again

Just like in GOLD parser now