Remove no longer valid options