removed duplicated check on deteted values from system