Remove unused options for style clarity.

:+1: Then I'm pro Option A.