diff --git a/includes/admin/settings/class-sp-settings-players.php b/includes/admin/settings/class-sp-settings-players.php
index 413d7d4a..172b188e 100644
--- a/includes/admin/settings/class-sp-settings-players.php
+++ b/includes/admin/settings/class-sp-settings-players.php
@@ -98,20 +98,3 @@ class SP_Settings_Players extends SP_Settings_Page {
 endif;
 
 return new SP_Settings_Players();
-
-/*
-array(
-	'title' 	=> __( 'Templates', 'sportspress' ),
-	'type' 		=> 'templates',
-	'options' 	=> array(
-		'details' 		=> array(
-			'title' 	=> __( 'Details', 'sportspress' ),
-			'default' 	=> 'yes',
-		),
-		'statistics' 	=> array(
-			'title' 	=> __( 'Statistics', 'sportspress' ),
-			'default' 	=> 'yes',
-		),
-	),
-),
-*/
\ No newline at end of file
diff --git a/includes/class-sp-modules.php b/includes/class-sp-modules.php
index 0cbd501a..1e21f704 100644
--- a/includes/class-sp-modules.php
+++ b/includes/class-sp-modules.php
@@ -23,32 +23,6 @@ class SP_Modules {
 	 */
 	public function __construct() {
 		$this->data = apply_filters( 'sportspress_modules', array(
-			'general' => array(
-				'tutorials' => array(
-					'label' => __( 'Tutorials', 'sportspress' ),
-					'icon' => 'dashicons dashicons-video-alt3',
-				),
-				'overview' => array(
-					'label' => __( 'Overview', 'sportspress' ),
-					'icon' => 'dashicons dashicons-networking',
-				),
-				'widgets' => array(
-					'label' => __( 'Widgets', 'sportspress' ),
-					'icon' => 'dashicons dashicons-admin-generic',
-				),
-				'importers' => array(
-					'label' => __( 'Importers', 'sportspress' ),
-					'icon' => 'sp-icon-import',
-				),
-				'twitter' => array(
-					'label' => __( 'Twitter', 'sportspress' ),
-					'class' => 'SportsPress_Twitter',
-					'action' => __( 'Tweet #SportsPress', 'sportspress' ),
-					'link' => 'http://tboy.co/tweet',
-					'tip' => __( 'Help spread the word by tweeting with #SportsPress and get the Twitter module for free.', 'sportspress' ),
-					'icon' => 'dashicons dashicons-twitter',
-				),
-			),
 			'event' => array(
 				'calendars' => array(
 					'label' => __( 'Calendars', 'sportspress' ),
@@ -108,6 +82,18 @@ class SP_Modules {
 				),
 			),
 			'other' => array(
+				'tutorials' => array(
+					'label' => __( 'Tutorials', 'sportspress' ),
+					'icon' => 'dashicons dashicons-video-alt3',
+				),
+				'twitter' => array(
+					'label' => __( 'Twitter', 'sportspress' ),
+					'class' => 'SportsPress_Twitter',
+					'action' => __( 'Tweet #SportsPress', 'sportspress' ),
+					'link' => 'http://tboy.co/tweet',
+					'tip' => __( 'Help spread the word by tweeting with #SportsPress and get the Twitter module for free.', 'sportspress' ),
+					'icon' => 'dashicons dashicons-twitter',
+				),
 				'branding' => array(
 					'label' => __( 'Branding', 'sportspress' ),
 					'class' => 'SportsPress_Branding',
diff --git a/modules/sportspress-importers.php b/modules/sportspress-importers.php
index 040148f8..b3ebdcc3 100644
--- a/modules/sportspress-importers.php
+++ b/modules/sportspress-importers.php
@@ -57,6 +57,4 @@ class SportsPress_Importers {
 
 endif;
 
-if ( get_option( 'sportspress_load_importers_module', 'yes' ) == 'yes' ) {
-	new SportsPress_Importers();
-}
+new SportsPress_Importers();
diff --git a/modules/sportspress-overview.php b/modules/sportspress-overview.php
index 1ebc0a03..c28f7ef4 100644
--- a/modules/sportspress-overview.php
+++ b/modules/sportspress-overview.php
@@ -399,6 +399,4 @@ class SportsPress_Overview {
 
 endif;
 
-if ( get_option( 'sportspress_load_overview_module', 'yes' ) == 'yes' ) {
-	new SportsPress_Overview();
-}
+new SportsPress_Overview();
diff --git a/modules/sportspress-widgets.php b/modules/sportspress-widgets.php
index cb2e008e..8f2b6343 100644
--- a/modules/sportspress-widgets.php
+++ b/modules/sportspress-widgets.php
@@ -57,6 +57,4 @@ class SportsPress_Widgets {
 
 endif;
 
-if ( get_option( 'sportspress_load_widgets_module', 'yes' ) == 'yes' ) {
-	new SportsPress_Widgets();
-}
+new SportsPress_Widgets();