+ remove some unused code