Remove an explicit return undef