Merge cleanup to remove old ssl pinning code no longer used.