more efficient options cleanup