remove some unused code
remove some unused code