diff --git a/CMake/Modules/FindNF_CoreCLR.cmake b/CMake/Modules/FindNF_CoreCLR.cmake
index 79892fbaf3..9c01781c2a 100644
--- a/CMake/Modules/FindNF_CoreCLR.cmake
+++ b/CMake/Modules/FindNF_CoreCLR.cmake
@@ -88,7 +88,6 @@ set(NF_CoreCLR_SRCS
     corlib_native_System_GC.cpp
     corlib_native_System_Globalization_CultureInfo.cpp
     corlib_native_System_Globalization_DateTimeFormat.cpp
-    corlib_native_System_Globalization_DaylightTime.cpp
     corlib_native_System_Guid.cpp
     corlib_native_System_MarshalByRefObject.cpp
     corlib_native_System_Math.cpp
diff --git a/src/CLR/CorLib/corlib_native.cpp b/src/CLR/CorLib/corlib_native.cpp
index 5dcd4e6903..3e8754c1f8 100644
--- a/src/CLR/CorLib/corlib_native.cpp
+++ b/src/CLR/CorLib/corlib_native.cpp
@@ -99,9 +99,6 @@ static const CLR_RT_MethodHandler method_lookup[] =
     NULL,
     NULL,
     NULL,
-    NULL,
-    NULL,
-    NULL,
     Library_corlib_native_System_AppDomain::GetAssemblies___SZARRAY_SystemReflectionAssembly,
     Library_corlib_native_System_AppDomain::LoadInternal___SystemReflectionAssembly__STRING__BOOLEAN__I4__I4__I4__I4,
     Library_corlib_native_System_AppDomain::CreateDomain___STATIC__SystemAppDomain__STRING,
@@ -369,12 +366,7 @@ static const CLR_RT_MethodHandler method_lookup[] =
     NULL,
     NULL,
     NULL,
-    NULL,
-    NULL,
-    NULL,
     Library_corlib_native_System_Globalization_CultureInfo::get_CurrentUICultureInternal___STATIC__SystemGlobalizationCultureInfo,
-    Library_corlib_native_System_Globalization_CultureInfo::set_CurrentUICultureInternal___STATIC__VOID__SystemGlobalizationCultureInfo,
-    NULL,
     Library_corlib_native_System_Globalization_DateTimeFormat::FormatDigits___STATIC__STRING__I4__I4,
     NULL,
     NULL,
@@ -421,11 +413,6 @@ static const CLR_RT_MethodHandler method_lookup[] =
     NULL,
     NULL,
     NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
     Library_corlib_native_System_Guid::GenerateNewGuid___STATIC__SZARRAY_U1,
     NULL,
     NULL,
@@ -913,6 +900,6 @@ static const CLR_RT_MethodHandler method_lookup[] =
 const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_mscorlib =
 {
     "mscorlib", 
-    0xE1520B3E,
+    0x138C738A,
     method_lookup
 };
diff --git a/src/CLR/CorLib/corlib_native.h b/src/CLR/CorLib/corlib_native.h
index e93041e4b7..5b4b0caba6 100644
--- a/src/CLR/CorLib/corlib_native.h
+++ b/src/CLR/CorLib/corlib_native.h
@@ -116,15 +116,6 @@ struct Library_corlib_native_System_Collections_Hashtable__KeyCollection
 
 };
 
-struct Library_corlib_native_System_Globalization_Resources_CultureInfo
-{
-    static const int FIELD_STATIC__manager = 0;
-
-
-    //--//
-
-};
-
 struct Library_corlib_native_System_AppDomain
 {
     static const int FIELD___appDomain = 1;
@@ -411,7 +402,6 @@ struct Library_corlib_native_System_Globalization_CultureInfo
     static const int FIELD___parent = 5;
 
     NANOCLR_NATIVE_DECLARE(get_CurrentUICultureInternal___STATIC__SystemGlobalizationCultureInfo);
-    NANOCLR_NATIVE_DECLARE(set_CurrentUICultureInternal___STATIC__VOID__SystemGlobalizationCultureInfo);
 
     //--//
 
@@ -427,35 +417,10 @@ struct Library_corlib_native_System_Globalization_DateTimeFormat
 
 struct Library_corlib_native_System_Globalization_DateTimeFormatInfo
 {
-    static const int FIELD___amDesignator = 1;
-    static const int FIELD___pmDesignator = 2;
-    static const int FIELD___dateSeparator = 3;
-    static const int FIELD___longTimePattern = 4;
-    static const int FIELD___shortTimePattern = 5;
-    static const int FIELD___generalShortTimePattern = 6;
-    static const int FIELD___generalLongTimePattern = 7;
-    static const int FIELD___timeSeparator = 8;
-    static const int FIELD___monthDayPattern = 9;
-    static const int FIELD___fullDateTimePattern = 10;
-    static const int FIELD___longDatePattern = 11;
-    static const int FIELD___shortDatePattern = 12;
-    static const int FIELD___yearMonthPattern = 13;
-    static const int FIELD___abbreviatedDayNames = 14;
-    static const int FIELD___dayNames = 15;
-    static const int FIELD___abbreviatedMonthNames = 16;
-    static const int FIELD___monthNames = 17;
-    static const int FIELD__CultureInfo = 18;
-
-
-    //--//
-
-};
-
-struct Library_corlib_native_System_Globalization_DaylightTime
-{
-    static const int FIELD___daylightTimeStart = 1;
-    static const int FIELD___daylightTimeEnd = 2;
-    static const int FIELD___daylightTimeDelta = 3;
+    static const int FIELD___generalShortTimePattern = 1;
+    static const int FIELD___generalLongTimePattern = 2;
+    static const int FIELD___fullDateTimePattern = 3;
+    static const int FIELD__CultureInfo = 4;
 
 
     //--//
diff --git a/src/CLR/CorLib/corlib_native_System_Globalization_CultureInfo.cpp b/src/CLR/CorLib/corlib_native_System_Globalization_CultureInfo.cpp
index 3f66fd4ef7..0370540b88 100644
--- a/src/CLR/CorLib/corlib_native_System_Globalization_CultureInfo.cpp
+++ b/src/CLR/CorLib/corlib_native_System_Globalization_CultureInfo.cpp
@@ -15,13 +15,3 @@ HRESULT Library_corlib_native_System_Globalization_CultureInfo::get_CurrentUICul
 
     NANOCLR_NOCLEANUP_NOLABEL();
 }
-
-HRESULT Library_corlib_native_System_Globalization_CultureInfo::set_CurrentUICultureInternal___STATIC__VOID__SystemGlobalizationCultureInfo( CLR_RT_StackFrame& stack )
-{
-    NATIVE_PROFILE_CLR_CORE();
-    NANOCLR_HEADER();
-
-    g_CLR_RT_ExecutionEngine.m_currentUICulture = stack.Arg0().Dereference();        
-
-    NANOCLR_NOCLEANUP_NOLABEL();
-}
diff --git a/src/CLR/CorLib/corlib_native_System_Globalization_DaylightTime.cpp b/src/CLR/CorLib/corlib_native_System_Globalization_DaylightTime.cpp
deleted file mode 100644
index 488a22e748..0000000000
--- a/src/CLR/CorLib/corlib_native_System_Globalization_DaylightTime.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-// Copyright (c) 2017 The nanoFramework project contributors
-// Portions Copyright (c) Microsoft Corporation.  All rights reserved.
-// See LICENSE file in the project root for full license information.
-//
-#include "CorLib.h"
-
-// no code generated for this class
diff --git a/src/CLR/CorLib/corlib_native_System_String.cpp b/src/CLR/CorLib/corlib_native_System_String.cpp
index 22a8be0cd7..7c1f4d7b5a 100644
--- a/src/CLR/CorLib/corlib_native_System_String.cpp
+++ b/src/CLR/CorLib/corlib_native_System_String.cpp
@@ -1014,8 +1014,7 @@ HRESULT Library_corlib_native_System_String::Concat( CLR_RT_StackFrame& stack, C
             szTextSrc = ptrSrc->RecoverString();
             if(szTextSrc)
             {
-                // UNDONE: FIXME
-                // len = (CLR_UINT32)hal_strlen_s( szTextSrc );
+                len = (CLR_UINT32)hal_strlen_s( szTextSrc );
  
                 if(i==0)
                 {