Remove name checks