Remove undef check