Removed NULL.  It belongs elsewhere.
Removed NULL.  Temporarily commented out some functions.