options cleanup