remove old options (which are not used)

These can be easily changed so making them required will only complicate
the generation