Removed the rest of the goto statements