remove some unnecessary stuff