remove __ prefix/postfix and dry-run log-prefix