diff --git a/include/Zydis/Zydis.h b/include/Zydis/Zydis.h
index 468ddf9..04c5a15 100644
--- a/include/Zydis/Zydis.h
+++ b/include/Zydis/Zydis.h
@@ -111,8 +111,6 @@ enum ZydisFeatures
 {
     ZYDIS_FEATURE_EVEX,
     ZYDIS_FEATURE_MVEX,
-    ZYDIS_FEATURE_FLAGS,
-    ZYDIS_FEATURE_CPUID
 };
 
 /* ============================================================================================== */
diff --git a/src/Zydis.c b/src/Zydis.c
index a7a5713..edbdc32 100644
--- a/src/Zydis.c
+++ b/src/Zydis.c
@@ -45,24 +45,14 @@ ZydisBool ZydisIsFeatureEnabled(ZydisFeature feature)
 #else
         return ZYDIS_FALSE;
 #endif
+
     case ZYDIS_FEATURE_MVEX:
 #ifndef ZYDIS_DISABLE_MVEX
         return ZYDIS_TRUE;
 #else
         return ZYDIS_FALSE;
 #endif
-    case ZYDIS_FEATURE_FLAGS:
-#ifndef ZYDIS_DISABLE_FLAGS
-        return ZYDIS_TRUE;
-#else
-        return ZYDIS_FALSE;
-#endif
-    case ZYDIS_FEATURE_CPUID:
-#ifndef ZYDIS_DISABLE_CPUID
-        return ZYDIS_TRUE;
-#else
-        return ZYDIS_FALSE;
-#endif
+
     default:
         return ZYDIS_FALSE;
     }