- removed redundant checks