There's nothing left that actually needs this stuff, so I can just remove it all.