Remove TODOs for options

No need to add this functionality yet

Change-Id: Iba274971595dcb63b09d0030a933838a568376f9
Merge "Remove TODOs for options"