diff --git a/Sources/Plasma/CoreLib/CMakeLists.txt b/Sources/Plasma/CoreLib/CMakeLists.txt
index 968ea4cf..56e622a8 100644
--- a/Sources/Plasma/CoreLib/CMakeLists.txt
+++ b/Sources/Plasma/CoreLib/CMakeLists.txt
@@ -68,7 +68,6 @@ set(CoreLib_HEADERS
hsQuat.h
hsRefCnt.h
hsSafeRefCnt.h
- hsStlSortUtils.h
hsSTLStream.h
hsStream.h
hsStringTokenizer.h
diff --git a/Sources/Plasma/CoreLib/hsStlSortUtils.h b/Sources/Plasma/CoreLib/hsStlSortUtils.h
deleted file mode 100644
index 4c5d0bca..00000000
--- a/Sources/Plasma/CoreLib/hsStlSortUtils.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*==LICENSE==*
-
-CyanWorlds.com Engine - MMOG client, server and tools
-Copyright (C) 2011 Cyan Worlds, Inc.
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-
-Additional permissions under GNU GPL version 3 section 7
-
-If you modify this Program, or any covered work, by linking or
-combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
-NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
-JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
-(or a modified version of those libraries),
-containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
-PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
-JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
-licensors of this Program grant you additional
-permission to convey the resulting work. Corresponding Source for a
-non-source form of such a combination shall include the source code for
-the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
-work.
-
-You can contact Cyan Worlds, Inc. by email legal@cyan.com
- or by snail mail at:
- Cyan Worlds, Inc.
- 14617 N Newport Hwy
- Mead, WA 99021
-
-*==LICENSE==*/
-#ifndef hsStlSortUtils_inc
-#define hsStlSortUtils_inc
-
-// These get used a lot in char * STL maps, so lets just have them in one place
-
-class stringSorter
-{
-public:
- bool operator() (const char *s1, const char *s2) const
- {
- return (strcmp(s1,s2) < 0);
- }
-};
-
-class stringISorter
-{
-public:
- bool operator() (const char *s1, const char *s2) const
- {
- return (stricmp(s1,s2) < 0);
- }
-};
-
-#endif // hsStlSortUtils_inc
diff --git a/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp b/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp
index e8f24c46..5c7676b3 100644
--- a/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp
+++ b/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp
@@ -537,7 +537,7 @@ PF_CONSOLE_CMD(Stats, ListGroups, "", "Prints the names of all the stat groups t
plProfileManagerFull::GroupSet::iterator it;
for (it = groups.begin(); it != groups.end(); it++)
- PrintString((char*)*it);
+ PrintString(it->c_str());
}
PF_CONSOLE_CMD(Stats, ListLaps, "", "Prints the names of all the stats with laps to the console")
diff --git a/Sources/Plasma/FeatureLib/pfPython/Pch.h b/Sources/Plasma/FeatureLib/pfPython/Pch.h
index dc2fe84c..324fccfc 100644
--- a/Sources/Plasma/FeatureLib/pfPython/Pch.h
+++ b/Sources/Plasma/FeatureLib/pfPython/Pch.h
@@ -70,7 +70,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsGeometry3.h"
#include "hsQuat.h"
#include "hsResMgr.h"
-#include "hsStlSortUtils.h"
#include "hsStream.h"
#include "hsTemplates.h"
#include "hsTimer.h"
diff --git a/Sources/Plasma/FeatureLib/pfPython/plPythonPack.cpp b/Sources/Plasma/FeatureLib/pfPython/plPythonPack.cpp
index 80e18272..960e59f7 100644
--- a/Sources/Plasma/FeatureLib/pfPython/plPythonPack.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/plPythonPack.cpp
@@ -49,7 +49,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "HeadSpin.h"
#include "hsStream.h"
-#include "hsStlSortUtils.h"
#pragma hdrstop
#include "plPythonPack.h"
diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plAGAnim.h b/Sources/Plasma/PubUtilLib/plAvatar/plAGAnim.h
index 2aeab635..70e9b172 100644
--- a/Sources/Plasma/PubUtilLib/plAvatar/plAGAnim.h
+++ b/Sources/Plasma/PubUtilLib/plAvatar/plAGAnim.h
@@ -52,7 +52,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include