options cleanup
options cleanup