removing unneeded, missing alternatives

bad diag

missed var

(cherry picked from commit 0ca865c9)