Remove goto statements