Remove goto, limit skipping to NMP