Removed gotos