Remove last of the old span code.
7 files changed