remove some legacy junk