remove some more checks