Work in progress options cleanup.