Remove some redundant logic