fixing some legacy junk