Merge pull request #6398 from mikeller/remove_unused_modes