Remove goto version