Remove duplicated conditional