removed redundant checks