diff --git a/components/NVM/Settings.c b/components/NVM/Settings.c
index aa6c230..0901514 100644
--- a/components/NVM/Settings.c
+++ b/components/NVM/Settings.c
@@ -157,11 +157,6 @@ SystemKResult_T SETTINGS_get_uint32_t(SystemKSettingID_T id, uint32_t *value)
 
     switch (id)
     {
-    case SYSTEMK_SETTING_DEVICE_TYPE:
-        *value = BLE_DEVICE_TYPE_32ESPECIAL;
-        return result;
-        break;
-
     case SYSTEMK_SETTING_T_START_GAME_in_ms:
         key = "T_Start_Game_in_ms";
         break;
@@ -207,18 +202,6 @@ SystemKResult_T SETTINGS_set_uint32_t(SystemKSettingID_T id, uint32_t value)
     return result;
 }
 
-SystemKResult_T SETTINGS_get_device_name(char* name)
-{
-    SystemKResult_T result = SYSTEMK_RESULT_NOT_IMPLEMENTED;
-    return result;
-}
-
-SystemKResult_T SETTINGS_set_device_name(char* name)
-{
-    SystemKResult_T result = SYSTEMK_RESULT_NOT_IMPLEMENTED;
-    return result;
-}
-
 // Settings are saved on change in this implementation.
 SystemKResult_T SETTINGS_Save(void)
 {
diff --git a/components/SystemK b/components/SystemK
index 58f379d..4fe072f 160000
--- a/components/SystemK
+++ b/components/SystemK
@@ -1 +1 @@
-Subproject commit 58f379dc1871b06a7cde07e5e2b77e93f5aebaeb
+Subproject commit 4fe072f2d3280b19aa53e197bd22ec44b174ff88