diff --git a/src/Common/Dlgcode.c b/src/Common/Dlgcode.c
index 73957fec..cb15052c 100644
--- a/src/Common/Dlgcode.c
+++ b/src/Common/Dlgcode.c
@@ -351,17 +351,6 @@ void UpperCaseCopy (wchar_t *lpszDest, size_t cbDest, const wchar_t *lpszSource)
 }
 
 
-std::string ToUpperCase (const std::string &str)
-{
-	string u;
-	foreach (char c, str)
-	{
-		u += (char) toupper (c);
-	}
-
-	return u;
-}
-
 std::wstring ToUpperCase (const std::wstring &str)
 {
 	wstring u;
@@ -1588,7 +1577,7 @@ void HandCursor ()
 }
 
 void
-AddComboPair (HWND hComboBox, const char *lpszItem, int value)
+AddComboPair (HWND hComboBox, const wchar_t *lpszItem, int value)
 {
 	LPARAM nIndex;
 
@@ -1596,15 +1585,6 @@ AddComboPair (HWND hComboBox, const char *lpszItem, int value)
 	nIndex = SendMessage (hComboBox, CB_SETITEMDATA, nIndex, (LPARAM) value);
 }
 
-void
-AddComboPairW (HWND hComboBox, const wchar_t *lpszItem, int value)
-{
-	LPARAM nIndex;
-
-	nIndex = SendMessageW (hComboBox, CB_ADDSTRING, 0, (LPARAM) lpszItem);
-	nIndex = SendMessage (hComboBox, CB_SETITEMDATA, nIndex, (LPARAM) value);
-}
-
 void
 SelectAlgo (HWND hComboBox, int *algo_id)
 {
@@ -1634,22 +1614,22 @@ void PopulateWipeModeCombo (HWND hComboBox, BOOL bNA, BOOL bInPlaceEncryption, B
 {
 	if (bNA)
 	{
-		AddComboPairW (hComboBox, GetString ("NOT_APPLICABLE_OR_NOT_AVAILABLE"), TC_WIPE_NONE);
+		AddComboPair (hComboBox, GetString ("NOT_APPLICABLE_OR_NOT_AVAILABLE"), TC_WIPE_NONE);
 	}
 	else
 	{
 		if (!bHeaderWipe)
 		{
-			AddComboPairW (hComboBox, GetString ("WIPE_MODE_NONE"), TC_WIPE_NONE);				
+			AddComboPair (hComboBox, GetString ("WIPE_MODE_NONE"), TC_WIPE_NONE);				
 		}
 
-		AddComboPairW (hComboBox, GetString ("WIPE_MODE_1_RAND"), TC_WIPE_1_RAND);
-		AddComboPairW (hComboBox, GetString ("WIPE_MODE_3_DOD_5220"), TC_WIPE_3_DOD_5220);
-		AddComboPairW (hComboBox, GetString ("WIPE_MODE_7_DOD_5220"), TC_WIPE_7_DOD_5220);
-		AddComboPairW (hComboBox, GetString ("WIPE_MODE_35_GUTMANN"), TC_WIPE_35_GUTMANN);
+		AddComboPair (hComboBox, GetString ("WIPE_MODE_1_RAND"), TC_WIPE_1_RAND);
+		AddComboPair (hComboBox, GetString ("WIPE_MODE_3_DOD_5220"), TC_WIPE_3_DOD_5220);
+		AddComboPair (hComboBox, GetString ("WIPE_MODE_7_DOD_5220"), TC_WIPE_7_DOD_5220);
+		AddComboPair (hComboBox, GetString ("WIPE_MODE_35_GUTMANN"), TC_WIPE_35_GUTMANN);
 
 		if (bHeaderWipe)
-			AddComboPairW (hComboBox, GetString ("WIPE_MODE_256"), TC_WIPE_256); // paranoid wipe for volume header
+			AddComboPair (hComboBox, GetString ("WIPE_MODE_256"), TC_WIPE_256); // paranoid wipe for volume header
 	}
 }
 
@@ -4389,14 +4369,6 @@ wstring GetUserFriendlyVersionString (int version)
 	return (versionString);
 }
 
-string IntToString (int val)
-{
-	char szTmp [64];
-	StringCbPrintfA (szTmp, sizeof(szTmp), "%d", val);
-
-	return szTmp;
-}
-
 wstring IntToWideString (int val)
 {
 	wchar_t szTmp [64];
@@ -5092,7 +5064,7 @@ static BOOL CALLBACK RandomPoolEnrichementDlgProc (HWND hwndDlg, UINT msg, WPARA
 			for (hid = FIRST_PRF_ID; hid <= LAST_PRF_ID; hid++)
 			{
 				if (!HashIsDeprecated (hid))
-					AddComboPairW (hComboBox, HashGetName(hid), hid);
+					AddComboPair (hComboBox, HashGetName(hid), hid);
 			}
 			SelectAlgo (hComboBox, &hash_algo);
 
@@ -5240,7 +5212,7 @@ BOOL CALLBACK KeyfileGeneratorDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LP
 			for (hid = FIRST_PRF_ID; hid <= LAST_PRF_ID; hid++)
 			{
 				if (!HashIsDeprecated (hid))
-					AddComboPairW (hComboBox, HashGetName(hid), hid);
+					AddComboPair (hComboBox, HashGetName(hid), hid);
 			}
 			SelectAlgo (hComboBox, &hash_algo);
 
@@ -5581,7 +5553,7 @@ CipherTestDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 			for (ea = EAGetFirst (); ea != 0; ea = EAGetNext (ea))
 			{
 				if (EAGetCipherCount (ea) == 1 && EAIsFormatEnabled (ea))
-					AddComboPairW (GetDlgItem (hwndDlg, IDC_CIPHER), EAGetName (buf, ea, 1), EAGetFirstCipher (ea));
+					AddComboPair (GetDlgItem (hwndDlg, IDC_CIPHER), EAGetName (buf, ea, 1), EAGetFirstCipher (ea));
 			}
 
 			ResetCipherTest(hwndDlg, idTestCipher);
@@ -5900,15 +5872,15 @@ ResetCipherTest(HWND hwndDlg, int idTestCipher)
 	SendMessage (GetDlgItem(hwndDlg, IDC_KEY_SIZE), CB_RESETCONTENT, 0,0);
 	SendMessage (GetDlgItem(hwndDlg, IDC_TEST_BLOCK_NUMBER), CB_RESETCONTENT, 0,0);
 
-	ndx = (int) SendMessage (GetDlgItem(hwndDlg, IDC_PLAINTEXT_SIZE), CB_ADDSTRING, 0,(LPARAM) "64");
+	ndx = (int) SendMessage (GetDlgItem(hwndDlg, IDC_PLAINTEXT_SIZE), CB_ADDSTRING, 0,(LPARAM) L"64");
 	SendMessage(GetDlgItem(hwndDlg, IDC_PLAINTEXT_SIZE), CB_SETITEMDATA, ndx,(LPARAM) 8);
 	SendMessage(GetDlgItem(hwndDlg, IDC_PLAINTEXT_SIZE), CB_SETCURSEL, ndx,0);
 
 	for (ndx = 0; ndx < BLOCKS_PER_XTS_DATA_UNIT; ndx++)
 	{
-		char tmpStr [16];
+		wchar_t tmpStr [16];
 
-		StringCbPrintfA (tmpStr, sizeof(tmpStr), "%d", ndx);
+		StringCbPrintfW (tmpStr, sizeof(tmpStr), L"%d", ndx);
 
 		ndx = (int) SendMessage (GetDlgItem(hwndDlg, IDC_TEST_BLOCK_NUMBER), CB_ADDSTRING, 0,(LPARAM) tmpStr);
 		SendMessage(GetDlgItem(hwndDlg, IDC_TEST_BLOCK_NUMBER), CB_SETITEMDATA, ndx,(LPARAM) ndx);
@@ -9873,28 +9845,6 @@ std::string WideToUtf8String (const std::wstring &wideString)
 }
 
 
-std::string WideToSingleString (const std::wstring &wideString)
-{
-	if (wideString.empty())
-		return std::string();
-
-	char buf[65536];
-	int len = WideCharToMultiByte (CP_ACP, 0, wideString.c_str(), -1, buf, array_capacity (buf) - 1, NULL, NULL);
-	throw_sys_if (len == 0);
-
-	buf[len] = 0;
-	return buf;
-}
-
-
-std::string StringToUpperCase (const std::string &str)
-{
-	string upperCase (str);
-	_strupr ((char *) upperCase.c_str());
-	return upperCase;
-}
-
-
 #ifndef SETUP
 
 BOOL CALLBACK SecurityTokenPasswordDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
@@ -10003,7 +9953,7 @@ static BOOL CALLBACK NewSecurityTokenKeyfileDlgProc (HWND hwndDlg, UINT msg, WPA
 				wstringstream tokenLabel;
 				tokenLabel << L"[" << token.SlotId << L"] " << token.Label;
 
-				AddComboPairW (GetDlgItem (hwndDlg, IDC_SELECTED_TOKEN), tokenLabel.str().c_str(), token.SlotId);
+				AddComboPair (GetDlgItem (hwndDlg, IDC_SELECTED_TOKEN), tokenLabel.str().c_str(), token.SlotId);
 			}
 
 			ComboBox_SetCurSel (GetDlgItem (hwndDlg, IDC_SELECTED_TOKEN), 0);
diff --git a/src/Common/Dlgcode.h b/src/Common/Dlgcode.h
index af983a63..e857f948 100644
--- a/src/Common/Dlgcode.h
+++ b/src/Common/Dlgcode.h
@@ -264,8 +264,7 @@ void WaitCursor ( void );
 void NormalCursor ( void );
 void ArrowWaitCursor ( void );
 void HandCursor ();
-void AddComboPair (HWND hComboBox, const char *lpszItem, int value);
-void AddComboPairW (HWND hComboBox, const wchar_t *lpszItem, int value);
+void AddComboPair (HWND hComboBox, const wchar_t *lpszItem, int value);
 void SelectAlgo ( HWND hComboBox , int *nCipher );
 void PopulateWipeModeCombo (HWND hComboBox, BOOL bNA, BOOL bInPlaceEncryption, BOOL bHeaderWipe);
 wchar_t *GetWipeModeName (WipeAlgorithmId modeId);
@@ -544,11 +543,8 @@ struct RawDevicesDlgParam
 BOOL BrowseFilesInDir (HWND hwndDlg, char *stringId, wchar_t *initialDir, wchar_t *lpszFileName, BOOL keepHistory, BOOL saveMode, wchar_t *browseFilter, const wchar_t *initialFileName = NULL, const wchar_t *defaultExtension = NULL);
 std::wstring SingleStringToWide (const std::string &singleString);
 std::wstring Utf8StringToWide (const std::string &utf8String);
-std::string WideToSingleString (const std::wstring &wideString);
 std::string WideToUtf8String (const std::wstring &wideString);
-std::string StringToUpperCase (const std::string &str);
 std::vector <HostDevice> GetAvailableHostDevices (bool noDeviceProperties = false, bool singleList = false, bool noFloppy = true, bool detectUnencryptedFilesystems = false);
-std::string ToUpperCase (const std::string &str);
 std::wstring ToUpperCase (const std::wstring &str);
 std::wstring GetWrongPasswordErrorMessage (HWND hwndDlg);
 std::wstring GetWindowsEdition ();
@@ -558,7 +554,6 @@ std::wstring VolumeGuidPathToDevicePath (std::wstring volumeGuidPath);
 std::wstring HarddiskVolumePathToPartitionPath (const std::wstring &harddiskVolumePath);
 std::wstring FindLatestFileOrDirectory (const std::wstring &directory, const wchar_t *namePattern, bool findDirectory, bool findFile);
 std::wstring GetUserFriendlyVersionString (int version);
-std::string IntToString (int val);
 std::wstring IntToWideString (int val);
 inline std::wstring AppendSrcPos (const wchar_t* msg, const char* srcPos)
 {
diff --git a/src/Common/Volumes.c b/src/Common/Volumes.c
index 051a9ecf..3f0c5b67 100644
--- a/src/Common/Volumes.c
+++ b/src/Common/Volumes.c
@@ -1013,17 +1013,17 @@ int CreateVolumeHeaderInMemory (HWND hwndDlg, BOOL bBoot, char *header, int ea,
 		MasterKeyGUIView[0] = 0;
 		for (i = 0; i < j; i++)
 		{
-			char tmp2[8] = {0};
-			StringCbPrintfA (tmp2, sizeof(tmp2), "%02X", (int) (unsigned char) keyInfo.master_keydata[i + primaryKeyOffset]);
-			StringCbCatA (MasterKeyGUIView, sizeof(MasterKeyGUIView), tmp2);
+			wchar_t tmp2[8] = {0};
+			StringCbPrintfW (tmp2, sizeof(tmp2), L"%02X", (int) (unsigned char) keyInfo.master_keydata[i + primaryKeyOffset]);
+			StringCbCatW (MasterKeyGUIView, sizeof(MasterKeyGUIView), tmp2);
 		}
 
 		HeaderKeyGUIView[0] = 0;
 		for (i = 0; i < NBR_KEY_BYTES_TO_DISPLAY; i++)
 		{
-			char tmp2[8];
-			StringCbPrintfA (tmp2, sizeof(tmp2), "%02X", (int) (unsigned char) dk[primaryKeyOffset + i]);
-			StringCbCatA (HeaderKeyGUIView, sizeof(HeaderKeyGUIView), tmp2);
+			wchar_t tmp2[8];
+			StringCbPrintfW (tmp2, sizeof(tmp2), L"%02X", (int) (unsigned char) dk[primaryKeyOffset + i]);
+			StringCbCatW (HeaderKeyGUIView, sizeof(HeaderKeyGUIView), tmp2);
 		}
 
 		if (dots3)
diff --git a/src/Format/Tcformat.c b/src/Format/Tcformat.c
index e33b1ec2..95517701 100644
Binary files a/src/Format/Tcformat.c and b/src/Format/Tcformat.c differ
diff --git a/src/Format/Tcformat.h b/src/Format/Tcformat.h
index 778daebf..d71860bd 100644
--- a/src/Format/Tcformat.h
+++ b/src/Format/Tcformat.h
@@ -51,7 +51,7 @@ BOOL CALLBACK PageDialogProc ( HWND hwndDlg , UINT uMsg , WPARAM wParam , LPARAM
 BOOL CALLBACK MainDialogProc ( HWND hwndDlg , UINT uMsg , WPARAM wParam , LPARAM lParam );
 void ExtractCommandLine ( HWND hwndDlg , wchar_t *lpszCommandLine );
 void DisplayRandPool (HWND hwndDlg, HWND hPoolDisplay, BOOL bShow);
-void DisplayPortionsOfKeys (HWND headerKeyHandle, HWND masterKeyHandle, char *headerKeyStr, char *masterKeyStr, BOOL hideKeys);
+void DisplayPortionsOfKeys (HWND headerKeyHandle, HWND masterKeyHandle, wchar_t *headerKeyStr, wchar_t *masterKeyStr, BOOL hideKeys);
 int DetermineMaxHiddenVolSize (HWND hwndDlg);
 BOOL IsSparseFile (HWND hwndDlg);
 BOOL GetFileVolSize (HWND hwndDlg, unsigned __int64 *size);
@@ -100,8 +100,8 @@ extern int nPbar;
 extern volatile int WizardMode;
 extern volatile BOOL bInPlaceEncNonSysResumed;
 
-extern char HeaderKeyGUIView [KEY_GUI_VIEW_SIZE];
-extern char MasterKeyGUIView [KEY_GUI_VIEW_SIZE];
+extern wchar_t HeaderKeyGUIView [KEY_GUI_VIEW_SIZE];
+extern wchar_t MasterKeyGUIView [KEY_GUI_VIEW_SIZE];
 extern volatile int NonSysInplaceEncStatus;
 
 #ifdef __cplusplus
diff --git a/src/Mount/Mount.c b/src/Mount/Mount.c
index 4a50ee35..2ba55e49 100644
--- a/src/Mount/Mount.c
+++ b/src/Mount/Mount.c
@@ -10029,7 +10029,7 @@ static BOOL CALLBACK PerformanceSettingsDlgProc (HWND hwndDlg, UINT msg, WPARAM
 
 			for (uint32 i = 1; i < sysInfo.dwNumberOfProcessors; ++i)
 			{
-				stringstream s;
+				wstringstream s;
 				s << i;
 				AddComboPair (freeCpuCombo, s.str().c_str(), i);
 			}