You are correct on both points.  I left the dead code in place in case something goes wrong and I need to know quicker "how it used to work".  This intent applies to the extra logging messages added, but should go away once Turner is "happy".