diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp
index 08c634ba20..ff97be524f 100644
--- a/src/aircraft_cmd.cpp
+++ b/src/aircraft_cmd.cpp
@@ -2055,7 +2055,7 @@ bool Aircraft::Tick()
 {
 	if (!this->IsNormalAircraft()) return true;
 
-	PerformanceAccumulator framerate(PFE_GL_AIRCRAFT);
+	// PerformanceAccumulator framerate(PFE_GL_AIRCRAFT);
 
 	this->tick_counter++;
 
diff --git a/src/framerate_gui.cpp b/src/framerate_gui.cpp
index 060b19a4a1..7a5650dfc0 100644
--- a/src/framerate_gui.cpp
+++ b/src/framerate_gui.cpp
@@ -305,13 +305,13 @@ void PerformanceAccumulator::Reset(PerformanceElement elem)
 void ShowFrametimeGraphWindow(PerformanceElement elem);
 
 
-static const PerformanceElement DISPLAY_ORDER_PFE[PFE_MAX] = {
+static const PerformanceElement DISPLAY_ORDER_PFE[PFE_MAX - 4] = {
 	PFE_GAMELOOP,
 	PFE_GL_ECONOMY,
-	PFE_GL_TRAINS,
-	PFE_GL_ROADVEHS,
-	PFE_GL_SHIPS,
-	PFE_GL_AIRCRAFT,
+	// PFE_GL_TRAINS,
+	// PFE_GL_ROADVEHS,
+	// PFE_GL_SHIPS,
+	// PFE_GL_AIRCRAFT,
 	PFE_GL_LANDSCAPE,
 	PFE_ALLSCRIPTS,
 	PFE_GAMESCRIPT,
diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp
index 9704770016..68ba372352 100644
--- a/src/roadveh_cmd.cpp
+++ b/src/roadveh_cmd.cpp
@@ -1588,7 +1588,7 @@ Money RoadVehicle::GetRunningCost() const
 
 bool RoadVehicle::Tick()
 {
-	PerformanceAccumulator framerate(PFE_GL_ROADVEHS);
+	// PerformanceAccumulator framerate(PFE_GL_ROADVEHS);
 
 	this->tick_counter++;
 
diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp
index 786375689b..e85e5f9c3b 100644
--- a/src/ship_cmd.cpp
+++ b/src/ship_cmd.cpp
@@ -793,7 +793,7 @@ reverse_direction:
 
 bool Ship::Tick()
 {
-	PerformanceAccumulator framerate(PFE_GL_SHIPS);
+	// PerformanceAccumulator framerate(PFE_GL_SHIPS);
 
 	if (!(this->vehstatus & VS_STOPPED)) this->running_ticks++;
 
diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp
index 29b2e543e0..801e02a9df 100644
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -3901,7 +3901,7 @@ Money Train::GetRunningCost() const
  */
 bool Train::Tick()
 {
-	PerformanceAccumulator framerate(PFE_GL_TRAINS);
+//	PerformanceAccumulator framerate(PFE_GL_TRAINS);
 
 	this->tick_counter++;