remove some checks for cases that can't be hit