Clean out some outdated V2 code.