Same here.

Its a tid bit confusing why you are searching for it in options but deleting in index_spec.
Why not use the macro to search and delete it if found from index_spec right away without messing with options?