remove some unused code