More debug logging.  Clean up add/remove logging.