Rremoving "two-mode-mode" code because it is buggy, out of date, and not...

... very helpful anymore.