Clean up gotos