remove some redundant stuff