diff --git a/SNESGameController.mm b/SNESGameController.mm
index 12131d6..131c15c 100644
--- a/SNESGameController.mm
+++ b/SNESGameController.mm
@@ -42,7 +42,7 @@ NSArray *BSNESRawControlNames = nil;
                                      forKey:OEControlsPreferenceKey]];
         
         BSNESRawControlNames = [[NSArray alloc] initWithObjects:BSNESEmulatorNames
-                                                         count:SNES_CONTROL_COUNT];
+                                                          count:SNES_CONTROL_COUNT];
     }
 }
 
@@ -56,11 +56,6 @@ NSArray *BSNESRawControlNames = nil;
     return MAC_MAX_PLAYERS;
 }
 
-- (NSString *)pluginName
-{
-    return @"BSNESPlugin";
-}
-
 - (Class)gameCoreClass
 {
     return [BSNESGameEmu class];
diff --git a/SNESGameEmu.mm b/SNESGameEmu.mm
index 9783b58..7d0e4fd 100644
--- a/SNESGameEmu.mm
+++ b/SNESGameEmu.mm
@@ -176,21 +176,18 @@ bool loadCartridge(const char *filename, SNES::MappedRAM &memory) {
 - (void)stopEmulation
 {
 	/*
-	NSString* path = [NSString stringWithUTF8String:Memory.ROMFilename];
-	NSString *extensionlessFilename = [[path lastPathComponent] stringByDeletingPathExtension];	
-	NSString *appSupportPath = [[[NSHomeDirectory() stringByAppendingPathComponent:@"Library"] stringByAppendingPathComponent:@"Application Support"] stringByAppendingPathComponent:@"Snes9x"];
-	if(![[NSFileManager defaultManager] fileExistsAtPath:appSupportPath])
-		[[NSFileManager defaultManager] createDirectoryAtPath:appSupportPath attributes:nil];
-
-	
-	NSLog(@"Trying to save SRAM");
-	
-	NSString *batterySavesDirectory = [appSupportPath stringByAppendingPathComponent:@"Battery Saves"];
-	if(![[NSFileManager defaultManager] fileExistsAtPath:batterySavesDirectory])
-		[[NSFileManager defaultManager] createDirectoryAtPath:batterySavesDirectory attributes:nil];
-	NSString *filePath = [batterySavesDirectory stringByAppendingPathComponent:[extensionlessFilename stringByAppendingPathExtension:@"sav"]];
-	
-	Memory.SaveSRAM( [filePath UTF8String] );
+     NSString *path = [NSString stringWithUTF8String:Memory.ROMFilename];
+     NSString *extensionlessFilename = [[path lastPathComponent] stringByDeletingPathExtension];	
+     
+     NSString *batterySavesDirectory = [self batterySavesDirectoryPath];
+     
+     [[NSFileManager defaultManager] createDirectoryAtPath:batterySavesDirectory withIntermediateDirectories:YES attributes:nil error:NULL];
+     
+     NSLog(@"Trying to save SRAM");
+     
+     NSString *filePath = [batterySavesDirectory stringByAppendingPathComponent:[extensionlessFilename stringByAppendingPathExtension:@"sav"]];
+     
+     Memory.SaveSRAM([filePath UTF8String]);
 	*/
 	[super stopEmulation];
 }