diff --git a/includes/admin/post-types/meta-boxes/class-sp-meta-box-player-details.php b/includes/admin/post-types/meta-boxes/class-sp-meta-box-player-details.php
index 6e1ed5ac..a2977ab2 100644
--- a/includes/admin/post-types/meta-boxes/class-sp-meta-box-player-details.php
+++ b/includes/admin/post-types/meta-boxes/class-sp-meta-box-player-details.php
@@ -83,6 +83,7 @@ class SP_Meta_Box_Player_Details {
 		sp_dropdown_taxonomies( $args );
 		?></p>
 
+		<?php if ( apply_filters( 'sportspress_player_teams', true ) ) { ?>
 		<p><strong><?php _e( 'Current Teams', 'sportspress' ); ?></strong></p>
 		<p><?php
 		$args = array(
@@ -112,6 +113,7 @@ class SP_Meta_Box_Player_Details {
 		);
 		sp_dropdown_pages( $args );
 		?></p>
+		<?php } ?>
 
 		<p><strong><?php _e( 'Competitions', 'sportspress' ); ?></strong></p>
 		<p><?php
diff --git a/includes/admin/post-types/meta-boxes/class-sp-meta-box-staff-details.php b/includes/admin/post-types/meta-boxes/class-sp-meta-box-staff-details.php
index eae18dd6..6073ef52 100644
--- a/includes/admin/post-types/meta-boxes/class-sp-meta-box-staff-details.php
+++ b/includes/admin/post-types/meta-boxes/class-sp-meta-box-staff-details.php
@@ -81,6 +81,7 @@ class SP_Meta_Box_Staff_Details {
 			<?php endforeach; ?>
 		</select></p>
 
+		<?php if ( apply_filters( 'sportspress_staff_teams', true ) ) { ?>
 		<p><strong><?php _e( 'Current Teams', 'sportspress' ); ?></strong></p>
 		<p><?php
 		$args = array(
@@ -110,6 +111,7 @@ class SP_Meta_Box_Staff_Details {
 		);
 		sp_dropdown_pages( $args );
 		?></p>
+		<?php } ?>
 
 		<p><strong><?php _e( 'Competitions', 'sportspress' ); ?></strong></p>
 		<p><?php
diff --git a/modules/sportspress-individual-mode.php b/modules/sportspress-individual-mode.php
index 2d3efe0c..977c81e1 100644
--- a/modules/sportspress-individual-mode.php
+++ b/modules/sportspress-individual-mode.php
@@ -34,8 +34,6 @@ class SportsPress_Individual_Mode {
 		// Filters
 		add_filter( 'gettext', array( $this, 'gettext' ), 99, 3 );
 		add_filter( 'pre_get_posts', array( $this, 'pre_get_posts' ) );
-		//add_filter( 'option_sportspress_event_show_total', '__return_false', 99 );
-		//add_action( 'sportspress_meta_boxes', array( $this, 'remove_meta_boxes' ), 99 );
 		add_filter( 'sportspress_register_post_type_team', array( $this, 'hide_post_type' ), 99 );
 		add_filter( 'sportspress_register_post_type_table', array( $this, 'move_table_post_type' ), 99 );
 		add_filter( 'sportspress_settings_tabs_array', array( $this, 'remove_team_settings_tab' ), 99 );
@@ -47,12 +45,16 @@ class SportsPress_Individual_Mode {
 		add_filter( 'sportspress_glance_items', array( $this, 'remove_glance_item' ), 99 );
 		add_filter( 'sportspress_shortcodes', array( $this, 'remove_shortcodes' ), 99 );
 		add_filter( 'sportspress_event_shortcodes', array( $this, 'remove_event_shortcodes' ), 99 );
+		add_filter( 'sportspress_player_admin_columns', array( $this, 'remove_team_column' ), 99 );
 		add_filter( 'sportspress_list_admin_columns', array( $this, 'remove_team_column' ), 99 );
+		add_filter( 'sportspress_staff_admin_columns', array( $this, 'remove_team_column' ), 99 );
+		add_filter( 'sportspress_directory_admin_columns', array( $this, 'remove_team_column' ), 99 );
 		add_filter( 'sportspress_importers', array( $this, 'remove_teams_importer' ), 99 );
 		add_filter( 'sportspress_permalink_slugs', array( $this, 'remove_team_permalink_slug' ), 99 );
-		//add_filter( 'sportspress_player_column_tabs', array( $this, 'player_column_tabs' ), 99 );
 		add_filter( 'sportspress_event_team_tabs', '__return_false' );
 		add_filter( 'sportspress_player_team_statistics', '__return_false' );
+		add_filter( 'sportspress_player_teams', '__return_false' );
+		add_filter( 'sportspress_staff_teams', '__return_false' );
 		add_filter( 'sportspress_list_team_selector', '__return_false' );
 		add_filter( 'sportspress_split_performance_tables', '__return_false' );
 	
@@ -259,16 +261,6 @@ class SportsPress_Individual_Mode {
 		}
 		return $slugs;
 	}
-
-	/**
-	 * Modify player column tabs.
-	 */
-	public function player_column_tabs( $tabs ) {
-		if ( ( $index = array_search ( 'sp_performance', $tabs ) ) !== false ) {
-			$tabs[ $index ] = 'sp_column';
-		}
-		return $tabs;
-	}
 }
 
 endif;