Remove duplicated check