diff --git a/Plugins/Tempo b/Plugins/Tempo
index 89c1d5c..a323513 160000
--- a/Plugins/Tempo
+++ b/Plugins/Tempo
@@ -1 +1 @@
-Subproject commit 89c1d5c18ed877c989810f7dc836c5fdbc9eec26
+Subproject commit a32351315dc25074707c0711e43aa4405cf45d2b
diff --git a/Plugins/TempoROS b/Plugins/TempoROS
index a3839a8..67fd9fc 160000
--- a/Plugins/TempoROS
+++ b/Plugins/TempoROS
@@ -1 +1 @@
-Subproject commit a3839a862173f57d5a312dc7b0882dc2753f339b
+Subproject commit 67fd9fc79b7cd4bd1fdef0f9af2c8e1fdf10efbb
diff --git a/Source/TempoSample.Target.cs b/Source/TempoSample.Target.cs
index a2a8a85..0bc8f3a 100644
--- a/Source/TempoSample.Target.cs
+++ b/Source/TempoSample.Target.cs
@@ -11,20 +11,5 @@ public TempoSampleTarget(TargetInfo Target) : base(Target)
 		DefaultBuildSettings = BuildSettingsVersion.Latest;
 		IncludeOrderVersion = EngineIncludeOrderVersion.Latest;
 		ExtraModuleNames.Add("TempoSample");
-
-		// TEMPO_TOOLCHAIN_BLOCK BEGIN - Added by UseTempoToolChain.sh script
-		if (Platform == UnrealTargetPlatform.Win64)
-		{
-			ToolChainName = "TempoVCToolChain";
-		}
-		else if (Platform == UnrealTargetPlatform.Mac)
-		{
-			ToolChainName = "TempoMacToolChain";
-		}
-		else if (Platform == UnrealTargetPlatform.Linux)
-		{
-			ToolChainName = "TempoLinuxToolChain";
-		}
-		// TEMPO_TOOLCHAIN_BLOCK END
 	}
 }
diff --git a/Source/TempoSampleEditor.Target.cs b/Source/TempoSampleEditor.Target.cs
index 672f14f..a8e79b6 100644
--- a/Source/TempoSampleEditor.Target.cs
+++ b/Source/TempoSampleEditor.Target.cs
@@ -11,20 +11,5 @@ public TempoSampleEditorTarget( TargetInfo Target) : base(Target)
 		DefaultBuildSettings = BuildSettingsVersion.Latest;
 		IncludeOrderVersion = EngineIncludeOrderVersion.Latest;
 		ExtraModuleNames.Add("TempoSample");
-
-		// TEMPO_TOOLCHAIN_BLOCK BEGIN - Added by UseTempoToolChain.sh script
-		if (Platform == UnrealTargetPlatform.Win64)
-		{
-			ToolChainName = "TempoVCToolChain";
-		}
-		else if (Platform == UnrealTargetPlatform.Mac)
-		{
-			ToolChainName = "TempoMacToolChain";
-		}
-		else if (Platform == UnrealTargetPlatform.Linux)
-		{
-			ToolChainName = "TempoLinuxToolChain";
-		}
-		// TEMPO_TOOLCHAIN_BLOCK END
 	}
 }