diff --git a/include/vlc_config_cat.h b/include/vlc_config_cat.h
index f2bece6c68..5488f17d2a 100644
--- a/include/vlc_config_cat.h
+++ b/include/vlc_config_cat.h
@@ -163,11 +163,6 @@
                 "more information. You can configure default options for " \
                 "each sout stream module here.")
 
-#define SOUT_SAP_TITLE N_( "SAP" )
-#define SOUT_SAP_HELP N_( \
-                 "SAP is a way to publically announce streams that are being "\
-                 "sent using multicast UDP or RTP." )
-
 #define SOUT_VOD_TITLE N_( "VOD" )
 #define SOUT_VOD_HELP N_( "VLC's implementation of Video On Demand" )
 
@@ -187,10 +182,6 @@
 #define AADVANCED_TITLE N_( "Advanced" )
 #define AADVANCED_HELP N_( "Advanced settings. Use with care...")
 
-#define CPU_TITLE N_( "CPU features" )
-#define CPU_HELP N_( "You can choose to disable some CPU accelerations " \
-        "here. Use with extreme care!" )
-
 #define MISC_TITLE N_( "Advanced settings" )
 
 
@@ -267,7 +258,6 @@ static const struct config_category_t categories_array[] =
     { SUBCAT_SOUT_MUX, SOUT_MUX_TITLE, SOUT_MUX_HELP },
     { SUBCAT_SOUT_ACO, SOUT_ACO_TITLE, SOUT_ACO_HELP },
     { SUBCAT_SOUT_PACKETIZER, SOUT_PACKET_TITLE, SOUT_PACKET_HELP },
-    { SUBCAT_SOUT_SAP, SOUT_SAP_TITLE, SOUT_SAP_HELP },
     { SUBCAT_SOUT_VOD, SOUT_VOD_TITLE, SOUT_VOD_HELP },
 
     { CAT_PLAYLIST, PLAYLIST_TITLE , PLAYLIST_HELP },
@@ -275,7 +265,6 @@ static const struct config_category_t categories_array[] =
     { SUBCAT_PLAYLIST_SD, SD_TITLE, SD_HELP },
 
     { CAT_ADVANCED, AADVANCED_TITLE, AADVANCED_HELP },
-    { SUBCAT_ADVANCED_CPU, CPU_TITLE, CPU_HELP },
     { SUBCAT_ADVANCED_MISC, MISC_TITLE, AADVANCED_HELP },
 
     { -1, NULL, NULL }
diff --git a/include/vlc_plugin.h b/include/vlc_plugin.h
index 509bad2ed4..276ebc3ab5 100644
--- a/include/vlc_plugin.h
+++ b/include/vlc_plugin.h
@@ -155,7 +155,6 @@ enum vlc_module_properties
 #define SUBCAT_VIDEO_GENERAL 301
 #define SUBCAT_VIDEO_VOUT 302
 #define SUBCAT_VIDEO_VFILTER 303
-#define SUBCAT_VIDEO_TEXT 304
 #define SUBCAT_VIDEO_SUBPIC 305
 
 #define CAT_INPUT 4
@@ -173,23 +172,17 @@ enum vlc_module_properties
 #define SUBCAT_SOUT_MUX 503
 #define SUBCAT_SOUT_ACO 504
 #define SUBCAT_SOUT_PACKETIZER 505
-#define SUBCAT_SOUT_SAP 506
 #define SUBCAT_SOUT_VOD 507
 
 #define CAT_ADVANCED 6
-#define SUBCAT_ADVANCED_CPU 601
 #define SUBCAT_ADVANCED_MISC 602
 #define SUBCAT_ADVANCED_NETWORK 603
-#define SUBCAT_ADVANCED_XML 604
 
 #define CAT_PLAYLIST 7
 #define SUBCAT_PLAYLIST_GENERAL 701
 #define SUBCAT_PLAYLIST_SD 702
 #define SUBCAT_PLAYLIST_EXPORT 703
 
-#define CAT_OSD 8
-#define SUBCAT_OSD_IMPORT 801
-
 
 /**
  * Current plugin ABI version
diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index ac1a40d6ac..fe1e539677 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -1003,11 +1003,6 @@ static const char *const ppsz_prefres[] = {
  * Advanced
  ****************************************************************************/
 
-// DEPRECATED
-#define CPU_CAT_LONGTEXT N_( \
-    "These options allow you to enable special CPU optimizations. " \
-    "You should always leave all these enabled." )
-
 // DEPRECATED
 #define MISC_CAT_LONGTEXT N_( \
     "These options allow you to select default modules. Leave these " \
@@ -1960,6 +1955,9 @@ vlc_module_begin ()
 
 
     set_subcategory( SUBCAT_SOUT_STREAM )
+    add_integer( "sap-interval", 5, ANN_SAPINTV_TEXT,
+                               ANN_SAPINTV_LONGTEXT, true )
+
     set_subcategory( SUBCAT_SOUT_MUX )
     add_module( "mux", "sout mux", NULL, MUX_TEXT, MUX_LONGTEXT, true )
     set_subcategory( SUBCAT_SOUT_ACO )
@@ -1974,16 +1972,10 @@ vlc_module_begin ()
     add_module( "packetizer", "packetizer", NULL,
                 PACKETIZER_TEXT, PACKETIZER_LONGTEXT, true )
 
-    set_subcategory( SUBCAT_SOUT_SAP )
-    add_integer( "sap-interval", 5, ANN_SAPINTV_TEXT,
-                               ANN_SAPINTV_LONGTEXT, true )
-
     set_subcategory( SUBCAT_SOUT_VOD )
 
 /* CPU options */
     set_category( CAT_ADVANCED )
-    set_subcategory( SUBCAT_ADVANCED_CPU )
-    add_category_hint( N_("CPU"), CPU_CAT_LONGTEXT, true )
     add_obsolete_bool( "fpu" )
 #if defined( __i386__ ) || defined( __x86_64__ )
     add_obsolete_bool( "mmx" ) /* since 2.0.0 */