LPS-36654 cleanup
LPS-36654 only sanitize when it will be logged