Found much more dead code.

Doxygen seems to miss some of the #if 0'ed stuff, so the actual
deletion from d31a93cd6d6382dd6487a revealed more stuff.