Cleaned up logging.  Removed some commented code.