Remove goto