remove some legacy