remove some more code