Merge "Remove KeyValuePair logging"