Remove implemented TODO.
Data is now separated into equivalence classes