remove some unneededs