remove some redundancy