Removed redundant logic