Get rid of more legacy cruft. It compiles... I doubt that it actually
works.