Remove some remaining old options references.

Testing Done:
CI passed. Manual testing of cmd-line flags.

Reviewed at https://rbcommons.com/s/twitter/r/1317/