remove some unnecessary assignments