Remove unused options for style clarity.

i'm a fan of option A