Removed redundant checks