diff --git a/indra/cmake/ConfigurePkgConfig.cmake b/indra/cmake/ConfigurePkgConfig.cmake
index d947a52884..7d20ed9702 100644
--- a/indra/cmake/ConfigurePkgConfig.cmake
+++ b/indra/cmake/ConfigurePkgConfig.cmake
@@ -61,14 +61,13 @@ IF("$ENV{PKG_CONFIG_LIBDIR}" STREQUAL "")
   # Also add some non-architecture specific package locations.
   SET(VALID_PKG_LIBDIRS "${VALID_PKG_LIBDIRS}:/usr/share/pkgconfig:/usr/local/share/pkgconfig")
 
-  # Remove first unwanted ':'                                                                                                                                                                                                                                                                                                  
+  # Remove first unwanted ':'
 # <FS:ND> using -1 for remaining lengh is only valid since cmake 2.8,5
 #  string(SUBSTRING ${VALID_PKG_LIBDIRS} 1 -1 VALID_PKG_LIBDIRS)    
 
   string( LENGTH ${VALID_PKG_LIBDIRS} VALID_PKG_LIBDIRS_LENGTH )
   math( EXPR VALID_PKG_LIBDIRS_LENGTH ${VALID_PKG_LIBDIRS_LENGTH}-1 )
   string( SUBSTRING ${VALID_PKG_LIBDIRS} 1 ${VALID_PKG_LIBDIRS_LENGTH} VALID_PKG_LIBDIRS )
-
 # </FS:ND>
 
   # Set PKG_CONFIG_LIBDIR environment.
diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp
index 0f215489e6..3642f29553 100644
--- a/indra/llinventory/llinventory.cpp
+++ b/indra/llinventory/llinventory.cpp
@@ -656,84 +656,6 @@ bool LLInventoryItem::unpackMessage(LLMessageSystem* msg, const char* block, S32
 #endif
 }
 
-// <FS:ND> Helper functions
-void splitCacheDescOrName(char *aBuffer, char *&aJunk, char *&aValue);  /// <FS:CR> Various Missing
-int splitCacheLine(char *aBuffer, char *&aKeyword, char *&aValue);      /// Prototypes
-inline bool isWS( char aVal )
-{
-    return aVal == ' ' || aVal == '\t' || aVal == '\r' || aVal == '\n';
-}
-
-inline bool isNewLine( char aVal )
-{
-    return aVal == '\r' || aVal == '\n';
-}
-
-void splitCacheDescOrName( char *aBuffer, char *&aJunk, char *&aValue )
-{
-    aJunk = aBuffer;
-    aValue = 0;
-
-    while( *aBuffer && *aBuffer != '\t' )
-        ++aBuffer;
-
-    if( *aBuffer == '\t' )
-    {
-        *aBuffer = 0;
-        aValue = ++aBuffer;
-
-        while( *aBuffer && *aBuffer != '|' )
-            ++aBuffer;
-
-        *aBuffer = 0;
-    }
-    else
-    {
-        aValue = aJunk;
-        --aBuffer;
-        if( *aBuffer == '|' )
-            *aBuffer = 0;
-    }
-
-}
-
-int splitCacheLine( char *aBuffer, char *&aKeyword, char *&aValue )
-{
-    while( *aBuffer && isWS( *aBuffer ) )
-        ++aBuffer;
-
-    if( !*aBuffer )
-        return 0;
-
-    int nKWLen(0);
-    aKeyword = aBuffer;
-
-    while( *aBuffer && !isWS( *aBuffer ) )
-    {
-        ++nKWLen;
-        ++aBuffer;
-    }
-
-    if( !isWS( *aBuffer ) )
-        return 0;
-
-    *aBuffer = 0;
-    aValue = ++aBuffer;
-
-    // Is this really necessay?
-    while( *aValue && isWS( *aValue ) )
-        ++aValue;
-
-    // Searching for trailing newline now.
-    while( *aBuffer && !isNewLine(*aBuffer)   )
-        ++aBuffer;
-
-    *aBuffer = 0;   // Kill the newline
-
-    return nKWLen;
-}
-// </FS:ND>
-
 // virtual
 bool LLInventoryItem::importLegacyStream(std::istream& input_stream)
 {