diff --git a/BizHawk.Client.Common/PathManager.cs b/BizHawk.Client.Common/PathManager.cs
index a5fd47f87d..cc60a664f3 100644
--- a/BizHawk.Client.Common/PathManager.cs
+++ b/BizHawk.Client.Common/PathManager.cs
@@ -237,6 +237,14 @@ namespace BizHawk.Client.Common
 			// zero 22-jul-2012 - i dont think this is used the same way it used to. game.Name shouldnt be a path, so this stuff is illogical.
 			// if game.Name is a path, then someone shouldve made it not-a-path already.
 			// return Path.Combine(Path.GetDirectoryName(filesystemSafeName), Path.GetFileNameWithoutExtension(filesystemSafeName));
+
+			// adelikat:
+			// This hack is to prevent annoying things like Super Mario Bros..bk2
+			if (filesystemSafeName.EndsWith("."))
+			{
+				return filesystemSafeName.Remove(filesystemSafeName.Length - 1, 1);
+			}
+
 			return filesystemSafeName;
 		}
 
diff --git a/BizHawk.Client.EmuHawk/movie/RecordMovie.cs b/BizHawk.Client.EmuHawk/movie/RecordMovie.cs
index d953044941..ba4354e17f 100644
--- a/BizHawk.Client.EmuHawk/movie/RecordMovie.cs
+++ b/BizHawk.Client.EmuHawk/movie/RecordMovie.cs
@@ -82,10 +82,6 @@ namespace BizHawk.Client.EmuHawk
 							movieToRecord.TextSavestate = sw.ToString();
 						}
 					}
-
-					//var bytestate = Global.Emulator.SaveStateBinary();
-					//string stringstate = Convert.ToBase64String(bytestate);
-					//movieToRecord.SavestateBinaryBase64Blob = stringstate;
 				}
 
 				// Header