Remove undefined vars