options cleanup
Revert "options cleanup"

This reverts commit 5365da12fa22622d66799a04d0e42e94736ef7a4.
Revert "Revert "options cleanup""

This reverts commit 3073e1cbb29cb764d993c351a1cdd067c673c4ee.