More trimming of logging statements