diff --git a/includes/admin/post-types/meta-boxes/class-sp-meta-box-list-data.php b/includes/admin/post-types/meta-boxes/class-sp-meta-box-list-data.php
index 7cd9cc19..72e6f141 100644
--- a/includes/admin/post-types/meta-boxes/class-sp-meta-box-list-data.php
+++ b/includes/admin/post-types/meta-boxes/class-sp-meta-box-list-data.php
@@ -52,10 +52,12 @@ class SP_Meta_Box_List_Data {
 							<?php echo 'number' == $orderby ? '#' : __( 'Rank', 'sportspress' ); ?>
 						</label></th>
 						<th><?php _e( 'Player', 'sportspress' ); ?></th>
-						<th><label for="sp_columns_team">
-							<input type="checkbox" name="sp_columns[]" value="team" id="sp_columns_team" <?php checked( ! is_array( $columns ) || array_key_exists( 'team', $columns ) ); ?>>
-							<?php _e( 'Team', 'sportspress' ); ?>
-						</label></th>
+						<?php if ( apply_filters( 'sportspress_has_teams', true ) ) { ?>
+							<th><label for="sp_columns_team">
+								<input type="checkbox" name="sp_columns[]" value="team" id="sp_columns_team" <?php checked( ! is_array( $columns ) || array_key_exists( 'team', $columns ) ); ?>>
+								<?php _e( 'Team', 'sportspress' ); ?>
+							</label></th>
+						<?php } ?>
 						<?php foreach ( $columns as $key => $label ): ?>
 							<?php if ( in_array( $key, array( 'number', 'team' ) ) ) continue; ?>
 							<th><label for="sp_columns_<?php echo $key; ?>">
@@ -100,21 +102,23 @@ class SP_Meta_Box_List_Data {
 										<a class="button button-primary sp-save"><?php _e( 'Save', 'sportspress' ); ?></a>
 									</span>
 								</td>
-								<td>
-									<?php
-									$selected = sp_array_value( $player_stats, 'team', get_post_meta( get_the_ID(), 'sp_team', true ) );
-									if ( ! $selected ) $selected = get_post_meta( $player_id, 'sp_team', true );
-									$include = get_post_meta( $player_id, 'sp_team' );
-									$args = array(
-										'post_type' => 'sp_team',
-										'name' => 'sp_players[' . $player_id . '][team]',
-										'include' => $include,
-										'selected' => $selected,
-										'values' => 'ID',
-									);
-									wp_dropdown_pages( $args );
-									?>
-								</td>
+								<?php if ( apply_filters( 'sportspress_has_teams', true ) ) { ?>
+									<td>
+										<?php
+										$selected = sp_array_value( $player_stats, 'team', get_post_meta( get_the_ID(), 'sp_team', true ) );
+										if ( ! $selected ) $selected = get_post_meta( $player_id, 'sp_team', true );
+										$include = get_post_meta( $player_id, 'sp_team' );
+										$args = array(
+											'post_type' => 'sp_team',
+											'name' => 'sp_players[' . $player_id . '][team]',
+											'include' => $include,
+											'selected' => $selected,
+											'values' => 'ID',
+										);
+										wp_dropdown_pages( $args );
+										?>
+									</td>
+								<?php } ?>
 								<?php foreach( $columns as $column => $label ):
 									if ( in_array( $column, array( 'number', 'team' ) ) ) continue;
 									$value = sp_array_value( $player_stats, $column, '' );
@@ -129,7 +133,7 @@ class SP_Meta_Box_List_Data {
 					else:
 					?>
 					<tr class="sp-row alternate">
-						<td colspan="<?php $colspan = sizeof( $columns ) + 3; echo $colspan; ?>">
+						<td colspan="<?php $colspan = sizeof( $columns ) + ( apply_filters( 'sportspress_has_teams', true ) ? 3 : 2 ); echo $colspan; ?>">
 							<?php printf( __( 'Select %s', 'sportspress' ), __( 'Data', 'sportspress' ) ); ?>
 						</td>
 					</tr>
diff --git a/includes/class-sp-post-types.php b/includes/class-sp-post-types.php
index 5bfae892..c8467517 100644
--- a/includes/class-sp-post-types.php
+++ b/includes/class-sp-post-types.php
@@ -32,150 +32,160 @@ class SP_Post_types {
 	public static function register_taxonomies() {
 		do_action( 'sportspress_register_taxonomy' );
 
-		$labels = array(
-			'name' => __( 'Competitions', 'sportspress' ),
-			'singular_name' => __( 'Competition', 'sportspress' ),
-			'all_items' => __( 'All', 'sportspress' ),
-			'edit_item' => __( 'Edit Competition', 'sportspress' ),
-			'view_item' => __( 'View', 'sportspress' ),
-			'update_item' => __( 'Update', 'sportspress' ),
-			'add_new_item' => __( 'Add New', 'sportspress' ),
-			'new_item_name' => __( 'Name', 'sportspress' ),
-			'parent_item' => __( 'Parent', 'sportspress' ),
-			'parent_item_colon' => __( 'Parent:', 'sportspress' ),
-			'search_items' =>  __( 'Search', 'sportspress' ),
-			'not_found' => __( 'No results found.', 'sportspress' ),
-		);
-		$args = array(
-			'label' => __( 'Competitions', 'sportspress' ),
-			'labels' => $labels,
-			'public' => true,
-			'show_in_nav_menus' => false,
-			'show_tagcloud' => false,
-			'hierarchical' => true,
-			'rewrite' => array( 'slug' => get_option( 'sportspress_league_slug', 'league' ) ),
-		);
-		$object_types = apply_filters( 'sportspress_league_object_types', array( 'sp_event', 'sp_calendar', 'sp_team', 'sp_table', 'sp_player', 'sp_list', 'sp_staff' ) );
-		register_taxonomy( 'sp_league', $object_types, $args );
-		foreach ( $object_types as $object_type ):
-			register_taxonomy_for_object_type( 'sp_league', $object_type );
-		endforeach;
+		if ( apply_filters( 'sportspress_has_leagues', true ) ):
+			$labels = array(
+				'name' => __( 'Competitions', 'sportspress' ),
+				'singular_name' => __( 'Competition', 'sportspress' ),
+				'all_items' => __( 'All', 'sportspress' ),
+				'edit_item' => __( 'Edit Competition', 'sportspress' ),
+				'view_item' => __( 'View', 'sportspress' ),
+				'update_item' => __( 'Update', 'sportspress' ),
+				'add_new_item' => __( 'Add New', 'sportspress' ),
+				'new_item_name' => __( 'Name', 'sportspress' ),
+				'parent_item' => __( 'Parent', 'sportspress' ),
+				'parent_item_colon' => __( 'Parent:', 'sportspress' ),
+				'search_items' =>  __( 'Search', 'sportspress' ),
+				'not_found' => __( 'No results found.', 'sportspress' ),
+			);
+			$args = array(
+				'label' => __( 'Competitions', 'sportspress' ),
+				'labels' => $labels,
+				'public' => true,
+				'show_in_nav_menus' => false,
+				'show_tagcloud' => false,
+				'hierarchical' => true,
+				'rewrite' => array( 'slug' => get_option( 'sportspress_league_slug', 'league' ) ),
+			);
+			$object_types = apply_filters( 'sportspress_league_object_types', array( 'sp_event', 'sp_calendar', 'sp_team', 'sp_table', 'sp_player', 'sp_list', 'sp_staff' ) );
+			register_taxonomy( 'sp_league', $object_types, $args );
+			foreach ( $object_types as $object_type ):
+				register_taxonomy_for_object_type( 'sp_league', $object_type );
+			endforeach;
+		endif;
 
-		$labels = array(
-			'name' => __( 'Seasons', 'sportspress' ),
-			'singular_name' => __( 'Season', 'sportspress' ),
-			'all_items' => __( 'All', 'sportspress' ),
-			'edit_item' => __( 'Edit Season', 'sportspress' ),
-			'view_item' => __( 'View', 'sportspress' ),
-			'update_item' => __( 'Update', 'sportspress' ),
-			'add_new_item' => __( 'Add New', 'sportspress' ),
-			'new_item_name' => __( 'Name', 'sportspress' ),
-			'parent_item' => __( 'Parent', 'sportspress' ),
-			'parent_item_colon' => __( 'Parent:', 'sportspress' ),
-			'search_items' =>  __( 'Search', 'sportspress' ),
-			'not_found' => __( 'No results found.', 'sportspress' ),
-		);
-		$args = array(
-			'label' => __( 'Seasons', 'sportspress' ),
-			'labels' => $labels,
-			'public' => true,
-			'show_in_nav_menus' => false,
-			'show_tagcloud' => false,
-			'hierarchical' => true,
-			'rewrite' => array( 'slug' => get_option( 'sportspress_season_slug', 'season' ) ),
-		);
-		$object_types = apply_filters( 'sportspress_season_object_types', array( 'sp_event', 'sp_calendar', 'sp_team', 'sp_table', 'sp_player', 'sp_list', 'sp_staff' ) );
-		register_taxonomy( 'sp_season', $object_types, $args );
-		foreach ( $object_types as $object_type ):
-			register_taxonomy_for_object_type( 'sp_season', $object_type );
-		endforeach;
+		if ( apply_filters( 'sportspress_has_seasons', true ) ):
+			$labels = array(
+				'name' => __( 'Seasons', 'sportspress' ),
+				'singular_name' => __( 'Season', 'sportspress' ),
+				'all_items' => __( 'All', 'sportspress' ),
+				'edit_item' => __( 'Edit Season', 'sportspress' ),
+				'view_item' => __( 'View', 'sportspress' ),
+				'update_item' => __( 'Update', 'sportspress' ),
+				'add_new_item' => __( 'Add New', 'sportspress' ),
+				'new_item_name' => __( 'Name', 'sportspress' ),
+				'parent_item' => __( 'Parent', 'sportspress' ),
+				'parent_item_colon' => __( 'Parent:', 'sportspress' ),
+				'search_items' =>  __( 'Search', 'sportspress' ),
+				'not_found' => __( 'No results found.', 'sportspress' ),
+			);
+			$args = array(
+				'label' => __( 'Seasons', 'sportspress' ),
+				'labels' => $labels,
+				'public' => true,
+				'show_in_nav_menus' => false,
+				'show_tagcloud' => false,
+				'hierarchical' => true,
+				'rewrite' => array( 'slug' => get_option( 'sportspress_season_slug', 'season' ) ),
+			);
+			$object_types = apply_filters( 'sportspress_season_object_types', array( 'sp_event', 'sp_calendar', 'sp_team', 'sp_table', 'sp_player', 'sp_list', 'sp_staff' ) );
+			register_taxonomy( 'sp_season', $object_types, $args );
+			foreach ( $object_types as $object_type ):
+				register_taxonomy_for_object_type( 'sp_season', $object_type );
+			endforeach;
+		endif;
 
-		$labels = array(
-			'name' => __( 'Venues', 'sportspress' ),
-			'singular_name' => __( 'Venue', 'sportspress' ),
-			'all_items' => __( 'All', 'sportspress' ),
-			'edit_item' => __( 'Edit Venue', 'sportspress' ),
-			'view_item' => __( 'View', 'sportspress' ),
-			'update_item' => __( 'Update', 'sportspress' ),
-			'add_new_item' => __( 'Add New', 'sportspress' ),
-			'new_item_name' => __( 'Name', 'sportspress' ),
-			'parent_item' => __( 'Parent', 'sportspress' ),
-			'parent_item_colon' => __( 'Parent:', 'sportspress' ),
-			'search_items' =>  __( 'Search', 'sportspress' ),
-			'not_found' => __( 'No results found.', 'sportspress' ),
-		);
-		$args = array(
-			'label' => __( 'Venues', 'sportspress' ),
-			'labels' => $labels,
-			'public' => true,
-			'show_in_nav_menus' => false,
-			'show_tagcloud' => false,
-			'hierarchical' => true,
-			'rewrite' => array( 'slug' => get_option( 'sportspress_venue_slug', 'venue' ) ),
-		);
-		$object_types = apply_filters( 'sportspress_event_object_types', array( 'sp_event', 'sp_calendar', 'sp_team' ) );
-		register_taxonomy( 'sp_venue', $object_types, $args );
-		foreach ( $object_types as $object_type ):
-			register_taxonomy_for_object_type( 'sp_venue', $object_type );
-		endforeach;
+		if ( apply_filters( 'sportspress_has_venues', true ) ):
+			$labels = array(
+				'name' => __( 'Venues', 'sportspress' ),
+				'singular_name' => __( 'Venue', 'sportspress' ),
+				'all_items' => __( 'All', 'sportspress' ),
+				'edit_item' => __( 'Edit Venue', 'sportspress' ),
+				'view_item' => __( 'View', 'sportspress' ),
+				'update_item' => __( 'Update', 'sportspress' ),
+				'add_new_item' => __( 'Add New', 'sportspress' ),
+				'new_item_name' => __( 'Name', 'sportspress' ),
+				'parent_item' => __( 'Parent', 'sportspress' ),
+				'parent_item_colon' => __( 'Parent:', 'sportspress' ),
+				'search_items' =>  __( 'Search', 'sportspress' ),
+				'not_found' => __( 'No results found.', 'sportspress' ),
+			);
+			$args = array(
+				'label' => __( 'Venues', 'sportspress' ),
+				'labels' => $labels,
+				'public' => true,
+				'show_in_nav_menus' => false,
+				'show_tagcloud' => false,
+				'hierarchical' => true,
+				'rewrite' => array( 'slug' => get_option( 'sportspress_venue_slug', 'venue' ) ),
+			);
+			$object_types = apply_filters( 'sportspress_event_object_types', array( 'sp_event', 'sp_calendar', 'sp_team' ) );
+			register_taxonomy( 'sp_venue', $object_types, $args );
+			foreach ( $object_types as $object_type ):
+				register_taxonomy_for_object_type( 'sp_venue', $object_type );
+			endforeach;
+		endif;
 
-		$labels = array(
-			'name' => __( 'Positions', 'sportspress' ),
-			'singular_name' => __( 'Position', 'sportspress' ),
-			'all_items' => __( 'All', 'sportspress' ),
-			'edit_item' => __( 'Edit Position', 'sportspress' ),
-			'view_item' => __( 'View', 'sportspress' ),
-			'update_item' => __( 'Update', 'sportspress' ),
-			'add_new_item' => __( 'Add New', 'sportspress' ),
-			'new_item_name' => __( 'Name', 'sportspress' ),
-			'parent_item' => __( 'Parent', 'sportspress' ),
-			'parent_item_colon' => __( 'Parent:', 'sportspress' ),
-			'search_items' =>  __( 'Search', 'sportspress' ),
-			'not_found' => __( 'No results found.', 'sportspress' ),
-		);
-		$args = array(
-			'label' => __( 'Positions', 'sportspress' ),
-			'labels' => $labels,
-			'public' => true,
-			'show_in_nav_menus' => false,
-			'show_tagcloud' => false,
-			'hierarchical' => true,
-			'rewrite' => array( 'slug' => get_option( 'sportspress_position_slug', 'position' ) ),
-		);
-		$object_types = apply_filters( 'sportspress_position_object_types', array( 'sp_player', 'sp_list', 'sp_performance' ) );
-		register_taxonomy( 'sp_position', $object_types, $args );
-		foreach ( $object_types as $object_type ):
-			register_taxonomy_for_object_type( 'sp_position', $object_type );
-		endforeach;
+		if ( apply_filters( 'sportspress_has_positions', true ) ):
+			$labels = array(
+				'name' => __( 'Positions', 'sportspress' ),
+				'singular_name' => __( 'Position', 'sportspress' ),
+				'all_items' => __( 'All', 'sportspress' ),
+				'edit_item' => __( 'Edit Position', 'sportspress' ),
+				'view_item' => __( 'View', 'sportspress' ),
+				'update_item' => __( 'Update', 'sportspress' ),
+				'add_new_item' => __( 'Add New', 'sportspress' ),
+				'new_item_name' => __( 'Name', 'sportspress' ),
+				'parent_item' => __( 'Parent', 'sportspress' ),
+				'parent_item_colon' => __( 'Parent:', 'sportspress' ),
+				'search_items' =>  __( 'Search', 'sportspress' ),
+				'not_found' => __( 'No results found.', 'sportspress' ),
+			);
+			$args = array(
+				'label' => __( 'Positions', 'sportspress' ),
+				'labels' => $labels,
+				'public' => true,
+				'show_in_nav_menus' => false,
+				'show_tagcloud' => false,
+				'hierarchical' => true,
+				'rewrite' => array( 'slug' => get_option( 'sportspress_position_slug', 'position' ) ),
+			);
+			$object_types = apply_filters( 'sportspress_position_object_types', array( 'sp_player', 'sp_list', 'sp_performance' ) );
+			register_taxonomy( 'sp_position', $object_types, $args );
+			foreach ( $object_types as $object_type ):
+				register_taxonomy_for_object_type( 'sp_position', $object_type );
+			endforeach;
+		endif;
 
-		$labels = array(
-			'name' => __( 'Jobs', 'sportspress' ),
-			'singular_name' => __( 'Job', 'sportspress' ),
-			'all_items' => __( 'All', 'sportspress' ),
-			'edit_item' => __( 'Edit Job', 'sportspress' ),
-			'view_item' => __( 'View', 'sportspress' ),
-			'update_item' => __( 'Update', 'sportspress' ),
-			'add_new_item' => __( 'Add New', 'sportspress' ),
-			'new_item_name' => __( 'Name', 'sportspress' ),
-			'parent_item' => __( 'Parent', 'sportspress' ),
-			'parent_item_colon' => __( 'Parent:', 'sportspress' ),
-			'search_items' =>  __( 'Search', 'sportspress' ),
-			'not_found' => __( 'No results found.', 'sportspress' ),
-		);
-		$args = array(
-			'label' => __( 'Jobs', 'sportspress' ),
-			'labels' => $labels,
-			'public' => true,
-			'show_in_nav_menus' => false,
-			'show_tagcloud' => false,
-			'hierarchical' => true,
-			'rewrite' => array( 'slug' => get_option( 'sportspress_role_slug', 'role' ) ),
-		);
-		$object_types = apply_filters( 'sportspress_role_object_types', array( 'sp_staff' ) );
-		register_taxonomy( 'sp_role', $object_types, $args );
-		foreach ( $object_types as $object_type ):
-			register_taxonomy_for_object_type( 'sp_role', $object_type );
-		endforeach;
+		if ( apply_filters( 'sportspress_has_roles', true ) ):
+			$labels = array(
+				'name' => __( 'Jobs', 'sportspress' ),
+				'singular_name' => __( 'Job', 'sportspress' ),
+				'all_items' => __( 'All', 'sportspress' ),
+				'edit_item' => __( 'Edit Job', 'sportspress' ),
+				'view_item' => __( 'View', 'sportspress' ),
+				'update_item' => __( 'Update', 'sportspress' ),
+				'add_new_item' => __( 'Add New', 'sportspress' ),
+				'new_item_name' => __( 'Name', 'sportspress' ),
+				'parent_item' => __( 'Parent', 'sportspress' ),
+				'parent_item_colon' => __( 'Parent:', 'sportspress' ),
+				'search_items' =>  __( 'Search', 'sportspress' ),
+				'not_found' => __( 'No results found.', 'sportspress' ),
+			);
+			$args = array(
+				'label' => __( 'Jobs', 'sportspress' ),
+				'labels' => $labels,
+				'public' => true,
+				'show_in_nav_menus' => false,
+				'show_tagcloud' => false,
+				'hierarchical' => true,
+				'rewrite' => array( 'slug' => get_option( 'sportspress_role_slug', 'role' ) ),
+			);
+			$object_types = apply_filters( 'sportspress_role_object_types', array( 'sp_staff' ) );
+			register_taxonomy( 'sp_role', $object_types, $args );
+			foreach ( $object_types as $object_type ):
+				register_taxonomy_for_object_type( 'sp_role', $object_type );
+			endforeach;
+		endif;
 
 		do_action( 'sportspress_after_register_taxonomy' );
 	}
diff --git a/modules/sportspress-individual-mode.php b/modules/sportspress-individual-mode.php
index 0a58daf8..6c644375 100644
--- a/modules/sportspress-individual-mode.php
+++ b/modules/sportspress-individual-mode.php
@@ -58,6 +58,7 @@ class SportsPress_Individual_Mode {
 		add_filter( 'sportspress_staff_teams', '__return_false' );
 		add_filter( 'sportspress_list_team_selector', '__return_false' );
 		add_filter( 'option_sportspress_event_split_players_by_team', '__return_false' );
+		add_filter( 'sportspress_has_teams', '__return_false' );
 	
 		// Remove templates
 		//remove_action( 'sportspress_single_event_content', 'sportspress_output_event_performance', 50 );