Remove 'exhaustive' - it's not really needed any more