Speed up the ListSets query by removing legacy support for wonky data mo...

...dels.