[WIP] Comments and temporary removals.This is a further narrowing of the logging API which is actually being used.