Remove undefined check