remove some legacy code
remove some legacy code