remove some unecessary checks