CLC-506 Consolidate operational log files

Also cleared out some obsolete comments.