remove some checks