remove some redundancies