diff --git a/includes/admin/post-types/meta-boxes/class-sp-meta-box-event-teams.php b/includes/admin/post-types/meta-boxes/class-sp-meta-box-event-teams.php
index ca39b517..c7edd959 100644
--- a/includes/admin/post-types/meta-boxes/class-sp-meta-box-event-teams.php
+++ b/includes/admin/post-types/meta-boxes/class-sp-meta-box-event-teams.php
@@ -53,20 +53,24 @@ class SP_Meta_Box_Event_Teams {
 					sp_dropdown_taxonomies( $args );
 					?>
 				</p>
-				<p class="sp-tab-select sp-title-generator">
-				<?php
-				$args = array(
-					'post_type' => 'sp_team',
-					'name' => 'sp_team[]',
-					'class' => 'sportspress-pages',
-					'show_option_none' => __( '&mdash; None &mdash;', 'sportspress' ),
-					'show_option_all' => __( '&mdash; Individual &mdash;', 'sportspress' ),
-					'values' => 'ID',
-					'selected' => $team,
-				);
-				sp_dropdown_pages( $args );
-				?>
-				</p>
+				<?php if ( 'teams' == get_option( 'sportspress_mode', 'teams' ) ) { ?>
+					<p class="sp-tab-select sp-title-generator">
+					<?php
+					$args = array(
+						'post_type' => 'sp_team',
+						'name' => 'sp_team[]',
+						'class' => 'sportspress-pages',
+						'show_option_none' => __( '&mdash; None &mdash;', 'sportspress' ),
+						'show_option_all' => __( '&mdash; Individual &mdash;', 'sportspress' ),
+						'values' => 'ID',
+						'selected' => $team,
+					);
+					sp_dropdown_pages( $args );
+					?>
+					</p>
+				<?php } else { ?>
+					<input type="hidden" name="sp_team[]" value="0">
+				<?php } ?>
 				<ul id="sp_team-tabs" class="wp-tab-bar sp-tab-bar">
 					<li class="wp-tab-active"><a href="#sp_player-all"><?php _e( 'Players', 'sportspress' ); ?></a></li>
 					<li class="wp-tab"><a href="#sp_staff-all"><?php _e( 'Staff', 'sportspress' ); ?></a></li>
@@ -84,7 +88,9 @@ class SP_Meta_Box_Event_Teams {
 	 * Save meta box data
 	 */
 	public static function save( $post_id, $post ) {
-		sp_update_post_meta_recursive( $post_id, 'sp_team', sp_array_value( $_POST, 'sp_team', array() ) );
+		if ( 'teams' == get_option( 'sportspress_mode', 'teams' ) ) {
+			sp_update_post_meta_recursive( $post_id, 'sp_team', sp_array_value( $_POST, 'sp_team', array() ) );
+		}
 		sp_update_post_meta_recursive( $post_id, 'sp_player', sp_array_value( $_POST, 'sp_player', array() ) );
 		sp_update_post_meta_recursive( $post_id, 'sp_staff', sp_array_value( $_POST, 'sp_staff', array() ) );
 	}
diff --git a/includes/admin/post-types/meta-boxes/class-sp-meta-box-player-statistics.php b/includes/admin/post-types/meta-boxes/class-sp-meta-box-player-statistics.php
index 88407461..1683ee4c 100644
--- a/includes/admin/post-types/meta-boxes/class-sp-meta-box-player-statistics.php
+++ b/includes/admin/post-types/meta-boxes/class-sp-meta-box-player-statistics.php
@@ -97,36 +97,40 @@ class SP_Meta_Box_Player_Statistics {
 									<td>&nbsp;</td>
 								<?php else: ?>
 									<td>
-										<?php
-										$value = sp_array_value( $leagues, $div_id, '-1' );
-										$args = array(
-											'post_type' => 'sp_team',
-											'name' => 'sp_leagues[' . $league_id . '][' . $div_id . ']',
-											'show_option_none' => __( '&mdash; None &mdash;', 'sportspress' ),
-											'show_option_all' => __( '&mdash; Individual &mdash;', 'sportspress' ),
-										    'sort_order'   => 'ASC',
-										    'sort_column'  => 'menu_order',
-											'selected' => $value,
-											'values' => 'ID',
-											'include' => $teams,
-											'tax_query' => array(
-												'relation' => 'AND',
-												array(
-													'taxonomy' => 'sp_league',
-													'terms' => $league_id,
-													'field' => 'id',
+										<?php $value = sp_array_value( $leagues, $div_id, '-1' ); ?>
+										<?php if ( 'teams' == get_option( 'sportspress_mode', 'teams' )  ) { ?>
+											<?php
+											$args = array(
+												'post_type' => 'sp_team',
+												'name' => 'sp_leagues[' . $league_id . '][' . $div_id . ']',
+												'show_option_none' => __( '&mdash; None &mdash;', 'sportspress' ),
+												'show_option_all' => __( '&mdash; Individual &mdash;', 'sportspress' ),
+											    'sort_order'   => 'ASC',
+											    'sort_column'  => 'menu_order',
+												'selected' => $value,
+												'values' => 'ID',
+												'include' => $teams,
+												'tax_query' => array(
+													'relation' => 'AND',
+													array(
+														'taxonomy' => 'sp_league',
+														'terms' => $league_id,
+														'field' => 'id',
+													),
+													array(
+														'taxonomy' => 'sp_season',
+														'terms' => $div_id,
+														'field' => 'id',
+													),
 												),
-												array(
-													'taxonomy' => 'sp_season',
-													'terms' => $div_id,
-													'field' => 'id',
-												),
-											),
-										);
-										if ( ! sp_dropdown_pages( $args ) ):
-											_e( '&mdash; None &mdash;', 'sportspress' );
-										endif;
-										?>
+											);
+											if ( ! sp_dropdown_pages( $args ) ):
+												_e( '&mdash; None &mdash;', 'sportspress' );
+											endif;
+											?>
+										<?php } else { ?>
+											<input type="checkbox" name="sp_leagues[<?php echo $league_id; ?>][<?php echo $div_id; ?>]" value="0" <?php checked( 0, $value ); ?>>
+										<?php } ?>
 									</td>
 								<?php endif; ?>
 							<?php endif; ?>
diff --git a/templates/player-details.php b/templates/player-details.php
index 9d169e56..44b74f60 100644
--- a/templates/player-details.php
+++ b/templates/player-details.php
@@ -46,26 +46,30 @@ $common[ __( 'Position', 'sportspress' ) ] = implode( ', ', $position_names );
 
 $data = array_merge( $metrics_before, $common, $metrics_after );
 
-if ( $current_teams ):
-	$teams = array();
-	foreach ( $current_teams as $team ):
-		$team_name = get_the_title( $team );
-		if ( $link_teams ) $team_name = '<a href="' . get_post_permalink( $team ) . '">' . $team_name . '</a>';
-		$teams[] = $team_name;
-	endforeach;
-	$label = _n( 'Current Team', 'Current Teams', count( $teams ), 'sportspress' );
-	$data[ $label ] = implode( ', ', $teams );
-endif;
+if ( 'teams' == get_option( 'sportspress_mode', 'teams' )  ) {
+	if ( $current_teams ):
+		$teams = array();
+		foreach ( $current_teams as $team ):
+			$team_name = get_the_title( $team );
+			if ( $link_teams ) $team_name = '<a href="' . get_post_permalink( $team ) . '">' . $team_name . '</a>';
+			$teams[] = $team_name;
+		endforeach;
+		$label = _n( 'Current Team', 'Current Teams', count( $teams ), 'sportspress' );
+		$data[ $label ] = implode( ', ', $teams );
+	endif;
 
-if ( $past_teams ):
-	$teams = array();
-	foreach ( $past_teams as $team ):
-		$team_name = get_the_title( $team );
-		if ( $link_teams ) $team_name = '<a href="' . get_post_permalink( $team ) . '">' . $team_name . '</a>';
-		$teams[] = $team_name;
-	endforeach;
-	$data[ __( 'Past Teams', 'sportspress' ) ] = implode( ', ', $teams );
-endif;
+	if ( $past_teams ):
+		$teams = array();
+		foreach ( $past_teams as $team ):
+			$team_name = get_the_title( $team );
+			if ( $link_teams ) $team_name = '<a href="' . get_post_permalink( $team ) . '">' . $team_name . '</a>';
+			$teams[] = $team_name;
+		endforeach;
+		$data[ __( 'Past Teams', 'sportspress' ) ] = implode( ', ', $teams );
+	endif;
+}
+
+$data = apply_filters( 'sportspress_player_details', $data, $id );
 
 $output = '<div class="sp-template sp-template-player-details sp-template-details"><div class="sp-list-wrapper"><dl class="sp-player-details">';