remove some legacy code