Better option deletion