remove some redundencies