diff --git a/CMakeLists.txt b/CMakeLists.txt
index 25074c595..0a568c6c0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -291,7 +291,6 @@ if(LINUX OR APPLE OR ANDROID OR BSD)
         src/common/processing_linux.c
         src/detection/disk/disk.c
         src/detection/terminalshell/terminalshell_linux.c
-        src/detection/kernel/kernel_linux.c
         src/detection/localip/localip_linux.c
     )
 endif()
@@ -366,7 +365,6 @@ if(MSYS OR WIN32)
         src/detection/font/font_windows.cpp
         src/detection/terminalshell/terminalshell_windows.cpp
         src/detection/terminalfont/terminalfont_windows.c
-        src/detection/kernel/kernel_windows.cpp
         src/detection/localip/localip_windows.c
         src/detection/uptime/uptime_windows.c
         src/util/windows/wmi.cpp
diff --git a/src/detection/kernel/kernel.h b/src/detection/kernel/kernel.h
deleted file mode 100644
index 1b29350f3..000000000
--- a/src/detection/kernel/kernel.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#ifndef FF_INCLUDED_detection_kernel_kernel
-#define FF_INCLUDED_detection_kernel_kernel
-
-#include "fastfetch.h"
-
-typedef struct FFKernelResult
-{
-    FFstrbuf sysname;
-    FFstrbuf release;
-    FFstrbuf version;
-    FFstrbuf error;
-} FFKernelResult;
-
-void ffDetectKernel(FFinstance* instance, FFKernelResult* result);
-
-#endif
diff --git a/src/detection/kernel/kernel_linux.c b/src/detection/kernel/kernel_linux.c
deleted file mode 100644
index 4ab70f027..000000000
--- a/src/detection/kernel/kernel_linux.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "kernel.h"
-
-void ffDetectKernel(FFinstance* instance, FFKernelResult* result)
-{
-    ffStrbufInit(&result->error);
-    ffStrbufInitS(&result->sysname, instance->state.utsname.sysname);
-    ffStrbufInitS(&result->release, instance->state.utsname.release);
-    ffStrbufInitS(&result->version, instance->state.utsname.version);
-}
diff --git a/src/detection/kernel/kernel_windows.cpp b/src/detection/kernel/kernel_windows.cpp
deleted file mode 100644
index 94a06d950..000000000
--- a/src/detection/kernel/kernel_windows.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-extern "C" {
-#include "kernel.h"
-}
-#include "util/windows/wmi.hpp"
-
-extern "C" void ffDetectKernel(FFinstance* instance, FFKernelResult* kernel)
-{
-    FF_UNUSED(instance);
-
-    ffStrbufInit(&kernel->error);
-
-    ffStrbufInitS(&kernel->sysname, "Windows_NT");
-    ffStrbufInit(&kernel->release);
-    ffStrbufInit(&kernel->version);
-
-    IEnumWbemClassObject* pEnumerator = ffQueryWmi(L"SELECT Version FROM Win32_OperatingSystem", &kernel->error);
-    if(!pEnumerator)
-        return;
-
-    IWbemClassObject *pclsObj = NULL;
-    ULONG uReturn = 0;
-
-    if(FAILED(pEnumerator->Next(WBEM_INFINITE, 1, &pclsObj, &uReturn)) || uReturn == 0)
-    {
-        ffStrbufInitS(&kernel->error, "No WMI result returned");
-        pEnumerator->Release();
-        return;
-    }
-
-    ffGetWmiObjString(pclsObj, L"Version", &kernel->release);
-
-    pclsObj->Release();
-    pEnumerator->Release();
-}
diff --git a/src/modules/kernel.c b/src/modules/kernel.c
index 02cece513..062b04f42 100644
--- a/src/modules/kernel.c
+++ b/src/modules/kernel.c
@@ -1,38 +1,22 @@
 #include "fastfetch.h"
 #include "common/printing.h"
-#include "detection/kernel/kernel.h"
 
 #define FF_KERNEL_MODULE_NAME "Kernel"
 #define FF_KERNEL_NUM_FORMAT_ARGS 3
 
 void ffPrintKernel(FFinstance* instance)
 {
-    FFKernelResult result;
-    ffDetectKernel(instance, &result);
-
-    if(result.error.length > 0)
-    {
-        ffPrintError(instance, FF_KERNEL_MODULE_NAME, 0, &instance->config.kernel, "%*s", result.error.length, result.error.chars);
-        goto exit;
-    }
-
     if(instance->config.kernel.outputFormat.length == 0)
     {
         ffPrintLogoAndKey(instance, FF_KERNEL_MODULE_NAME, 0, &instance->config.kernel.key);
-        ffStrbufPutTo(&result.release, stdout);
+        puts(instance->state.utsname.release);
     }
     else
     {
         ffPrintFormat(instance, FF_KERNEL_MODULE_NAME, 0, &instance->config.kernel, FF_KERNEL_NUM_FORMAT_ARGS, (FFformatarg[]){
-            {FF_FORMAT_ARG_TYPE_STRBUF, &result.sysname},
-            {FF_FORMAT_ARG_TYPE_STRBUF, &result.release},
-            {FF_FORMAT_ARG_TYPE_STRBUF, &result.version}
+            {FF_FORMAT_ARG_TYPE_STRING, instance->state.utsname.sysname},
+            {FF_FORMAT_ARG_TYPE_STRING, instance->state.utsname.release},
+            {FF_FORMAT_ARG_TYPE_STRING, instance->state.utsname.version}
         });
     }
-
-exit:
-    ffStrbufDestroy(&result.error);
-    ffStrbufDestroy(&result.sysname);
-    ffStrbufDestroy(&result.release);
-    ffStrbufDestroy(&result.version);
 }