GPII-75: Experimenting with generic UI Options controls
Removed some commented-out code.