remove some more redundant stuff