Removed a few uses of Options -- long dead