Cleanup the goto stuff