Some debugging and removing test code.  Precursor to integrating with lights stuff.