remove some legacy delarations