Remove now irrelvent TODOs [skip ci]
sets: universal_set -> universe [skip ci]