Drop the use of "null"