Some more old stuff that's no longer needed.

Delete some more old stuff.