Removing some redundant checks