I just want to add a point here:
Since we don't maintain the code, modifications we make to it to suit our use case should be as non-intrusive as possible, as to allow for further updates to merge cleanly and require minimal effort on our side. Removing code that is dead now but could be revived upstream later would potentially increase this burden.

Besides, it makes a decent code documentation item.