diff --git a/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs b/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
index bbcb401beb..a8798ced03 100644
--- a/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
+++ b/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
@@ -586,7 +586,6 @@ namespace BizHawk.Client.Common
 
 		public void SaveBranchStates(BinaryWriter bw)
 		{
-			bw.Write(currentBranch);
 			if (Settings.BranchStatesInTasproj)
 			{
 				bw.Write(BranchStates.Count);
@@ -605,7 +604,6 @@ namespace BizHawk.Client.Common
 
 		public void LoadBranchStates(BinaryReader br)
 		{
-			currentBranch = br.ReadInt32();
 			if (Settings.BranchStatesInTasproj)
 			{
 				try
@@ -705,7 +703,6 @@ namespace BizHawk.Client.Common
 		#region "Branches"
 
 		private SortedList<int, SortedList<int, StateManagerState>> BranchStates = new SortedList<int, SortedList<int, StateManagerState>>();
-		private int currentBranch = -1;
 
 		/// <summary>
 		/// Checks if the state at frame in the given branch (-1 for current) has any duplicates.
@@ -782,7 +779,6 @@ namespace BizHawk.Client.Common
 				stateList.Add(branchHash, kvp.Value);
 				Used += (ulong)stateList[branchHash].Length;
 			}
-			currentBranch = _movie.BranchCount;
 		}
 
 		public void RemoveBranch(int index)
@@ -810,10 +806,6 @@ namespace BizHawk.Client.Common
 				if (stateList.Count == 0)
 					BranchStates.Remove(kvp.Key);
 			}
-			if (currentBranch > index)
-				currentBranch--;
-			else if (currentBranch == index)
-				currentBranch = -1;
 		}
 
 		public void UpdateBranch(int index)
@@ -859,7 +851,6 @@ namespace BizHawk.Client.Common
 				stateList.Add(branchHash, kvp.Value);
 				Used += (ulong)stateList[branchHash].Length;
 			}
-			currentBranch = index;
 		}
 
 		public void LoadBranch(int index)
@@ -876,8 +867,6 @@ namespace BizHawk.Client.Common
 				if (kvp.Value.ContainsKey(branchHash))
 					SetState(kvp.Key, kvp.Value[branchHash].State);
 			}
-
-			currentBranch = index;
 		}
 
 		#endregion
diff --git a/BizHawk.sln b/BizHawk.sln
index 5b474fcd49..c95daded65 100644
--- a/BizHawk.sln
+++ b/BizHawk.sln
@@ -1,6 +1,6 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
 VisualStudioVersion = 14.0.23107.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Version", "Version\Version.csproj", "{0CE8B337-08E3-4602-BF10-C4D4C75D2F13}"