remove some unnecessary