remove some redudancy