Preliminary cleanup of options feature, which is still under heavy construction