Remove obsolete/confusing options and fix strings.

Change-Id: I26b5eeea7ddc8cc4984745daa52635ea95ad7c66
7 files changed