diff --git a/includes/class-sp-event.php b/includes/class-sp-event.php
index eac02b45..4d230be2 100644
--- a/includes/class-sp-event.php
+++ b/includes/class-sp-event.php
@@ -136,6 +136,8 @@ class SP_Event extends SP_Custom_Post{
 				endforeach;
 
 				foreach( $data as $player_id => $player_performance ):
+					if ( ! $player_id ) continue;
+
 					foreach( $labels as $key => $label ):
 						if ( array_key_exists( $key, $totals ) ):
 							$totals[ $key ] += sp_array_value( $player_performance, $key, 0 );
@@ -155,6 +157,7 @@ class SP_Event extends SP_Custom_Post{
 						$totals[ $key ] = $manual_total;
 					endif;
 				endforeach;
+				$performance[ $team_id ][0] = array_merge( $totals, sp_array_value( sp_array_value( $performance, $team_id, array() ), 0, array() ) );
 			endforeach;
 		endif;
 
@@ -184,8 +187,6 @@ class SP_Event extends SP_Custom_Post{
 			if ( sizeof( $equations ) ):
 				foreach ( $performance as $team => $players ):
 					foreach ( $players as $player => $player_performance ):
-						if ( ! $player ) continue;
-
 						// Prepare existing values for equation calculation
 						$vars = $player_performance;
 						foreach ( $vars as $key => $var ):
diff --git a/templates/event-performance-table.php b/templates/event-performance-table.php
index 82e86f7a..53cc3a97 100644
--- a/templates/event-performance-table.php
+++ b/templates/event-performance-table.php
@@ -174,22 +174,6 @@ if ( ! isset( $subs ) ) $subs = array();
 						$i++;
 
 					endforeach;
-
-					if ( sizeof( $equations ) ):
-
-						// Prepare total values for equation calculation
-						$vars = $totals;
-						foreach ( $vars as $key => $var ):
-							if ( empty( $var ) ) $vars[ $key ] = 0;
-						endforeach;
-						$vars = array_merge( $vars, array( 'eventsplayed' => 1 ) );
-						
-						// Calculate equation-based totals
-						foreach ( $equations as $key => $equation ):
-							$totals[ $key ] = sp_solve( $equation['equation'], $vars, $equation['precision'] );
-						endforeach;
-
-					endif;
 					?>
 				</tbody>
 			<?php endif; ?>
diff --git a/templates/event-performance.php b/templates/event-performance.php
index ffb42bd3..8cc6542d 100644
--- a/templates/event-performance.php
+++ b/templates/event-performance.php
@@ -77,30 +77,16 @@ if ( is_array( $teams ) ):
 
 	$columns = get_posts( $args );
 	
-	// Get formats and equations
+	// Get formats
 	$formats = array();
-	$equations = array();
 	
-	// Add to formats and equations
+	// Add to formats
 	foreach ( $columns as $column ) {
 		$format = get_post_meta( $column->ID, 'sp_format', true );
 		if ( '' === $format ) {
 			$format = 'number';
 		}
 		$formats[ $column->post_name ] = $format;
-		
-		if ( 'equation' === $format ) {
-			$equation = get_post_meta( $column->ID, 'sp_equation', true );
-			$precision = get_post_meta( $column->ID, 'sp_precision', true );
-			
-			if ( empty( $equation ) ) $equation = 0;
-			if ( empty( $precision ) ) $precision = 0;
-			
-			$equations[ $column->post_name ] = array(
-				'equation' => $equation,
-				'precision' => $precision,
-			);
-		}
 	}
 	
 	if ( $is_individual ) {
@@ -123,7 +109,6 @@ if ( is_array( $teams ) ):
 			'caption' => __( 'Box Score', 'sportspress' ),
 			'labels' => $labels,
 			'formats' => $formats,
-			'equations' => $equations,
 			'mode' => $mode,
 			'data' => $data,
 			'event' => $event,
@@ -234,7 +219,6 @@ if ( is_array( $teams ) ):
 								'caption' => 0 == $s && $team_id ? sp_get_team_name( $team_id, $abbreviate_teams ) : null,
 								'labels' => $labels[ $section_id ],
 								'formats' => $formats,
-								'equations' => $equations,
 								'mode' => $mode,
 								'data' => $data[ $section_id ],
 								'event' => $event,
@@ -271,7 +255,6 @@ if ( is_array( $teams ) ):
 						'caption' => $team_id ? sp_get_team_name( $team_id, $abbreviate_teams ) : null,
 						'labels' => $labels,
 						'formats' => $formats,
-						'equations' => $equations,
 						'mode' => $mode,
 						'data' => $data,
 						'event' => $event,