Remove redundant logic