Remove obselete null check