Removed obsolete options.

Change-Id: I4883ebf474ff814ff2f82282d05c2c7831bf9ff5