Remove unnecessary name check