remove some unnecessary calls