removing possibly redundant logic