remove some slow checks