Alarson/reducing log clutter

Sidekick: @jstenhouse