remove some legacy stuff refs #993