remove some unecessary conditions