Issue 6580 clean esapi log entries