Remove a few options not used/applicable anymore.

Change-Id: Ifb7aa682b0d3b4a8fc4ebe1a0b43cbb5e25c4d14
Merge "Remove a few options not used/applicable anymore."