VID-1594 Simplified logging