Remove a couple of gotos