Clean up dynamic option checks