clean up usage of NULL definition