Remove some legacy junk