Update TODO
Revert "Don't remove universe polymorphism settings"

This reverts commit e77287e908e14b214a1f42143ed2b0ce78ec7317.

It was an incorrect fix.
Really exclude Set Universe Polymorphism from removal