Remove NULs littering the code base