Remove a couple of gotos
Remove forgotten label
Remove one more goto