cleanups for the options refactoring