Remove some more unused debug code, and an obsolete TODO item.