Remove irrelevant TODOs
Remove polymorphic-name/collapser support