diff --git a/include/freerdp/settings.h b/include/freerdp/settings.h
index f8403dfc8..ae4b94b63 100644
--- a/include/freerdp/settings.h
+++ b/include/freerdp/settings.h
@@ -683,13 +683,9 @@ typedef struct
 #define FreeRDP_KerberosRdgIsProxy (1352)
 #define FreeRDP_IgnoreCertificate (1408)
 #define FreeRDP_CertificateName (1409)
-#define FreeRDP_CertificateFile (1410)
-#define FreeRDP_PrivateKeyFile (1411)
 #define FreeRDP_RdpServerRsaKey (1413)
 #define FreeRDP_RdpServerCertificate (1414)
 #define FreeRDP_ExternalCertificateManagement (1415)
-#define FreeRDP_CertificateContent (1416)
-#define FreeRDP_PrivateKeyContent (1417)
 #define FreeRDP_AutoAcceptCertificate (1419)
 #define FreeRDP_AutoDenyCertificate (1420)
 #define FreeRDP_CertificateAcceptedFingerprints (1421)
@@ -1222,15 +1218,11 @@ struct rdp_settings
 	/* Server Certificate */
 	ALIGN64 BOOL IgnoreCertificate;                /* 1408 */
 	ALIGN64 char* CertificateName;                 /* 1409 */
-	ALIGN64 char* CertificateFile;                 /* 1410 */
-	ALIGN64 char* PrivateKeyFile;                  /* 1411 */
-	UINT64 padding1412[1413 - 1412];               /* 1412 */
+	UINT64 padding1410[1413 - 1410];               /* 1410 */
 	ALIGN64 rdpPrivateKey* RdpServerRsaKey;        /* 1413 */
 	ALIGN64 rdpCertificate* RdpServerCertificate;  /* 1414 */
 	ALIGN64 BOOL ExternalCertificateManagement;    /* 1415 */
-	ALIGN64 char* CertificateContent;              /* 1416 */
-	ALIGN64 char* PrivateKeyContent;               /* 1417 */
-	UINT64 padding1418[1419 - 1418];               /* 1418 */
+	UINT64 padding1416[1419 - 1416];               /* 1416 */
 	ALIGN64 BOOL AutoAcceptCertificate;            /* 1419 */
 	ALIGN64 BOOL AutoDenyCertificate;              /* 1420 */
 	ALIGN64 char* CertificateAcceptedFingerprints; /* 1421 */
diff --git a/libfreerdp/common/settings_getters.c b/libfreerdp/common/settings_getters.c
index fc2cb3edb..64210fd46 100644
--- a/libfreerdp/common/settings_getters.c
+++ b/libfreerdp/common/settings_getters.c
@@ -2551,12 +2551,6 @@ const char* freerdp_settings_get_string(const rdpSettings* settings, size_t id)
 		case FreeRDP_CertificateAcceptedFingerprints:
 			return settings->CertificateAcceptedFingerprints;
 
-		case FreeRDP_CertificateContent:
-			return settings->CertificateContent;
-
-		case FreeRDP_CertificateFile:
-			return settings->CertificateFile;
-
 		case FreeRDP_CertificateName:
 			return settings->CertificateName;
 
@@ -2674,12 +2668,6 @@ const char* freerdp_settings_get_string(const rdpSettings* settings, size_t id)
 		case FreeRDP_PreconnectionBlob:
 			return settings->PreconnectionBlob;
 
-		case FreeRDP_PrivateKeyContent:
-			return settings->PrivateKeyContent;
-
-		case FreeRDP_PrivateKeyFile:
-			return settings->PrivateKeyFile;
-
 		case FreeRDP_ProxyHostname:
 			return settings->ProxyHostname;
 
@@ -2832,12 +2820,6 @@ char* freerdp_settings_get_string_writable(rdpSettings* settings, size_t id)
 		case FreeRDP_CertificateAcceptedFingerprints:
 			return settings->CertificateAcceptedFingerprints;
 
-		case FreeRDP_CertificateContent:
-			return settings->CertificateContent;
-
-		case FreeRDP_CertificateFile:
-			return settings->CertificateFile;
-
 		case FreeRDP_CertificateName:
 			return settings->CertificateName;
 
@@ -2955,12 +2937,6 @@ char* freerdp_settings_get_string_writable(rdpSettings* settings, size_t id)
 		case FreeRDP_PreconnectionBlob:
 			return settings->PreconnectionBlob;
 
-		case FreeRDP_PrivateKeyContent:
-			return settings->PrivateKeyContent;
-
-		case FreeRDP_PrivateKeyFile:
-			return settings->PrivateKeyFile;
-
 		case FreeRDP_ProxyHostname:
 			return settings->ProxyHostname;
 
@@ -3122,12 +3098,6 @@ BOOL freerdp_settings_set_string_(rdpSettings* settings, size_t id, char* val, s
 		case FreeRDP_CertificateAcceptedFingerprints:
 			return update_string_(&settings->CertificateAcceptedFingerprints, cnv.c, len);
 
-		case FreeRDP_CertificateContent:
-			return update_string_(&settings->CertificateContent, cnv.c, len);
-
-		case FreeRDP_CertificateFile:
-			return update_string_(&settings->CertificateFile, cnv.c, len);
-
 		case FreeRDP_CertificateName:
 			return update_string_(&settings->CertificateName, cnv.c, len);
 
@@ -3245,12 +3215,6 @@ BOOL freerdp_settings_set_string_(rdpSettings* settings, size_t id, char* val, s
 		case FreeRDP_PreconnectionBlob:
 			return update_string_(&settings->PreconnectionBlob, cnv.c, len);
 
-		case FreeRDP_PrivateKeyContent:
-			return update_string_(&settings->PrivateKeyContent, cnv.c, len);
-
-		case FreeRDP_PrivateKeyFile:
-			return update_string_(&settings->PrivateKeyFile, cnv.c, len);
-
 		case FreeRDP_ProxyHostname:
 			return update_string_(&settings->ProxyHostname, cnv.c, len);
 
@@ -3428,12 +3392,6 @@ BOOL freerdp_settings_set_string_copy_(rdpSettings* settings, size_t id, const c
 			return update_string_copy_(&settings->CertificateAcceptedFingerprints, cnv.cc, len,
 			                           cleanup);
 
-		case FreeRDP_CertificateContent:
-			return update_string_copy_(&settings->CertificateContent, cnv.cc, len, cleanup);
-
-		case FreeRDP_CertificateFile:
-			return update_string_copy_(&settings->CertificateFile, cnv.cc, len, cleanup);
-
 		case FreeRDP_CertificateName:
 			return update_string_copy_(&settings->CertificateName, cnv.cc, len, cleanup);
 
@@ -3551,12 +3509,6 @@ BOOL freerdp_settings_set_string_copy_(rdpSettings* settings, size_t id, const c
 		case FreeRDP_PreconnectionBlob:
 			return update_string_copy_(&settings->PreconnectionBlob, cnv.cc, len, cleanup);
 
-		case FreeRDP_PrivateKeyContent:
-			return update_string_copy_(&settings->PrivateKeyContent, cnv.cc, len, cleanup);
-
-		case FreeRDP_PrivateKeyFile:
-			return update_string_copy_(&settings->PrivateKeyFile, cnv.cc, len, cleanup);
-
 		case FreeRDP_ProxyHostname:
 			return update_string_copy_(&settings->ProxyHostname, cnv.cc, len, cleanup);
 
diff --git a/libfreerdp/common/settings_str.c b/libfreerdp/common/settings_str.c
index f961e08ba..f57e530a2 100644
--- a/libfreerdp/common/settings_str.c
+++ b/libfreerdp/common/settings_str.c
@@ -435,8 +435,6 @@ static const struct settings_str_entry settings_map[] = {
 	{ FreeRDP_CardName, FREERDP_SETTINGS_TYPE_STRING, "FreeRDP_CardName" },
 	{ FreeRDP_CertificateAcceptedFingerprints, FREERDP_SETTINGS_TYPE_STRING,
 	  "FreeRDP_CertificateAcceptedFingerprints" },
-	{ FreeRDP_CertificateContent, FREERDP_SETTINGS_TYPE_STRING, "FreeRDP_CertificateContent" },
-	{ FreeRDP_CertificateFile, FREERDP_SETTINGS_TYPE_STRING, "FreeRDP_CertificateFile" },
 	{ FreeRDP_CertificateName, FREERDP_SETTINGS_TYPE_STRING, "FreeRDP_CertificateName" },
 	{ FreeRDP_ClientAddress, FREERDP_SETTINGS_TYPE_STRING, "FreeRDP_ClientAddress" },
 	{ FreeRDP_ClientDir, FREERDP_SETTINGS_TYPE_STRING, "FreeRDP_ClientDir" },
@@ -479,8 +477,6 @@ static const struct settings_str_entry settings_map[] = {
 	{ FreeRDP_PkinitAnchors, FREERDP_SETTINGS_TYPE_STRING, "FreeRDP_PkinitAnchors" },
 	{ FreeRDP_PlayRemoteFxFile, FREERDP_SETTINGS_TYPE_STRING, "FreeRDP_PlayRemoteFxFile" },
 	{ FreeRDP_PreconnectionBlob, FREERDP_SETTINGS_TYPE_STRING, "FreeRDP_PreconnectionBlob" },
-	{ FreeRDP_PrivateKeyContent, FREERDP_SETTINGS_TYPE_STRING, "FreeRDP_PrivateKeyContent" },
-	{ FreeRDP_PrivateKeyFile, FREERDP_SETTINGS_TYPE_STRING, "FreeRDP_PrivateKeyFile" },
 	{ FreeRDP_ProxyHostname, FREERDP_SETTINGS_TYPE_STRING, "FreeRDP_ProxyHostname" },
 	{ FreeRDP_ProxyPassword, FREERDP_SETTINGS_TYPE_STRING, "FreeRDP_ProxyPassword" },
 	{ FreeRDP_ProxyUsername, FREERDP_SETTINGS_TYPE_STRING, "FreeRDP_ProxyUsername" },
diff --git a/libfreerdp/core/test/settings_property_lists.h b/libfreerdp/core/test/settings_property_lists.h
index 29460f1e5..a303a3f6c 100644
--- a/libfreerdp/core/test/settings_property_lists.h
+++ b/libfreerdp/core/test/settings_property_lists.h
@@ -347,8 +347,6 @@ static const size_t string_list_indices[] = {
 	FreeRDP_BitmapCachePersistFile,
 	FreeRDP_CardName,
 	FreeRDP_CertificateAcceptedFingerprints,
-	FreeRDP_CertificateContent,
-	FreeRDP_CertificateFile,
 	FreeRDP_CertificateName,
 	FreeRDP_ClientAddress,
 	FreeRDP_ClientDir,
@@ -388,8 +386,6 @@ static const size_t string_list_indices[] = {
 	FreeRDP_PkinitAnchors,
 	FreeRDP_PlayRemoteFxFile,
 	FreeRDP_PreconnectionBlob,
-	FreeRDP_PrivateKeyContent,
-	FreeRDP_PrivateKeyFile,
 	FreeRDP_ProxyHostname,
 	FreeRDP_ProxyPassword,
 	FreeRDP_ProxyUsername,