diff --git a/macosx/AddMagnetWindowController.m b/macosx/AddMagnetWindowController.m
index 3c49efdec..9c44998ee 100644
--- a/macosx/AddMagnetWindowController.m
+++ b/macosx/AddMagnetWindowController.m
@@ -164,8 +164,6 @@
 - (void) dealloc
 {
     [[NSNotificationCenter defaultCenter] removeObserver: self];
-
-
 }
 
 - (Torrent *) torrent
diff --git a/macosx/AddWindowController.m b/macosx/AddWindowController.m
index e0d0eb97f..bb2bffc62 100644
--- a/macosx/AddWindowController.m
+++ b/macosx/AddWindowController.m
@@ -151,8 +151,6 @@
     [[NSNotificationCenter defaultCenter] removeObserver: self];
 
     [fTimer invalidate];
-
-
 }
 
 - (Torrent *) torrent
diff --git a/macosx/CreatorWindowController.m b/macosx/CreatorWindowController.m
index 29d64d382..aa0f8af50 100644
--- a/macosx/CreatorWindowController.m
+++ b/macosx/CreatorWindowController.m
@@ -197,13 +197,10 @@ NSMutableSet *creatorWindowControllerSet = nil;
 
 - (void) dealloc
 {
-
-
     if (fInfo)
         tr_metaInfoBuilderFree(fInfo);
 
     [fTimer invalidate];
-
 }
 
 + (void) restoreWindowWithIdentifier: (NSString *) identifier state: (NSCoder *) state completionHandler: (void (^)(NSWindow *, NSError *)) completionHandler
diff --git a/macosx/DragOverlayWindow.m b/macosx/DragOverlayWindow.m
index 8e6d0ba81..987aa027c 100644
--- a/macosx/DragOverlayWindow.m
+++ b/macosx/DragOverlayWindow.m
@@ -75,8 +75,6 @@
 - (void) dealloc
 {
     [[NSNotificationCenter defaultCenter] removeObserver: self];
-
-
 }
 
 - (void) setTorrents: (NSArray *) files
diff --git a/macosx/FilterBarController.m b/macosx/FilterBarController.m
index 3a5da0770..7ddac1200 100644
--- a/macosx/FilterBarController.m
+++ b/macosx/FilterBarController.m
@@ -125,7 +125,6 @@
 - (void) dealloc
 {
     [[NSNotificationCenter defaultCenter] removeObserver: self];
-
 }
 
 - (void) setFilter: (id) sender
diff --git a/macosx/InfoActivityViewController.m b/macosx/InfoActivityViewController.m
index 95f3231a3..c13e4480c 100644
--- a/macosx/InfoActivityViewController.m
+++ b/macosx/InfoActivityViewController.m
@@ -100,8 +100,6 @@
 - (void) dealloc
 {
     [[NSNotificationCenter defaultCenter] removeObserver: self];
-
-
 }
 
 - (void) setInfoForTorrents: (NSArray *) torrents
diff --git a/macosx/InfoOptionsViewController.m b/macosx/InfoOptionsViewController.m
index fbd48e2a9..85af3fc5b 100644
--- a/macosx/InfoOptionsViewController.m
+++ b/macosx/InfoOptionsViewController.m
@@ -65,8 +65,6 @@
 - (void) dealloc
 {
     [[NSNotificationCenter defaultCenter] removeObserver: self];
-
-
 }
 
 - (void) setInfoForTorrents: (NSArray *) torrents
diff --git a/macosx/InfoTabButtonCell.m b/macosx/InfoTabButtonCell.m
index 8e1ac1253..00bc9d971 100644
--- a/macosx/InfoTabButtonCell.m
+++ b/macosx/InfoTabButtonCell.m
@@ -39,7 +39,6 @@
 - (void) dealloc
 {
     [[NSNotificationCenter defaultCenter] removeObserver: self];
-
 }
 
 - (void) setControlView: (NSView *) controlView
diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m
index a671889a4..07c42519b 100644
--- a/macosx/InfoWindowController.m
+++ b/macosx/InfoWindowController.m
@@ -139,9 +139,6 @@ typedef enum
 
     if ([fViewController respondsToSelector: @selector(saveViewSize)])
         [fViewController saveViewSize];
-
-
-
 }
 
 - (void) setInfoForTorrents: (NSArray *) torrents
diff --git a/macosx/MessageWindowController.m b/macosx/MessageWindowController.m
index fb3b73ebb..8b967f72c 100644
--- a/macosx/MessageWindowController.m
+++ b/macosx/MessageWindowController.m
@@ -139,11 +139,7 @@
 - (void) dealloc
 {
     [[NSNotificationCenter defaultCenter] removeObserver: self];
-
     [fTimer invalidate];
-
-
-
 }
 
 - (void) windowDidBecomeKey: (NSNotification *) notification
diff --git a/macosx/PiecesView.m b/macosx/PiecesView.m
index 40a0aae17..f41f477e9 100644
--- a/macosx/PiecesView.m
+++ b/macosx/PiecesView.m
@@ -56,8 +56,6 @@ enum
 - (void) dealloc
 {
     tr_free(fPieces);
-
-
 }
 
 - (void) setTorrent: (Torrent *) torrent
diff --git a/macosx/PortChecker.m b/macosx/PortChecker.m
index e5b21ac38..ec474904b 100644
--- a/macosx/PortChecker.m
+++ b/macosx/PortChecker.m
@@ -54,7 +54,6 @@
 - (void) dealloc
 {
     [fTimer invalidate];
-
 }
 
 - (port_status_t) status
diff --git a/macosx/PrefsController.m b/macosx/PrefsController.m
index 3ad1413ef..af3f977aa 100644
--- a/macosx/PrefsController.m
+++ b/macosx/PrefsController.m
@@ -151,9 +151,6 @@
     {
         [fPortChecker cancelProbe];
     }
-
-
-
 }
 
 - (void) awakeFromNib
diff --git a/macosx/StatsWindowController.m b/macosx/StatsWindowController.m
index f692af4e4..c9f77833e 100644
--- a/macosx/StatsWindowController.m
+++ b/macosx/StatsWindowController.m
@@ -118,6 +118,7 @@ tr_session * fLib = NULL;
 {
     [fTimer invalidate];
     fTimer = nil;
+    fStatsWindowInstance = nil;
 }
 
 + (void) restoreWindowWithIdentifier: (NSString *) identifier state: (NSCoder *) state completionHandler: (void (^)(NSWindow *, NSError *)) completionHandler
diff --git a/macosx/StatusBarController.m b/macosx/StatusBarController.m
index 5ab2a8bf7..b57011b33 100644
--- a/macosx/StatusBarController.m
+++ b/macosx/StatusBarController.m
@@ -89,7 +89,6 @@ typedef enum
 - (void) dealloc
 {
     [[NSNotificationCenter defaultCenter] removeObserver: self];
-
 }
 
 - (void) updateWithDownload: (CGFloat) dlRate upload: (CGFloat) ulRate
diff --git a/macosx/Torrent.m b/macosx/Torrent.m
index 2ff318b9d..f561b0aa7 100644
--- a/macosx/Torrent.m
+++ b/macosx/Torrent.m
@@ -239,11 +239,6 @@ bool trashDataFile(const char * filename, tr_error ** error)
 
     if (fFileStat)
         tr_torrentFilesFree(fFileStat, [self fileCount]);
-
-
-
-
-
 }
 
 - (NSString *) description
diff --git a/macosx/TorrentTableView.m b/macosx/TorrentTableView.m
index d2725fb9e..35f07aa5d 100644
--- a/macosx/TorrentTableView.m
+++ b/macosx/TorrentTableView.m
@@ -85,11 +85,6 @@
 - (void) dealloc
 {
     [[NSNotificationCenter defaultCenter] removeObserver: self];
-
-
-
-
-
 }
 
 - (void) awakeFromNib
diff --git a/macosx/VDKQueue/VDKQueue.m b/macosx/VDKQueue/VDKQueue.m
index 935e1c1ed..303c6b8fe 100755
--- a/macosx/VDKQueue/VDKQueue.m
+++ b/macosx/VDKQueue/VDKQueue.m
@@ -145,7 +145,6 @@ NSString * VDKQueueAccessRevocationNotification = @"VDKQueueAccessWasRevokedNoti
     [self removeAllPaths];
     
     _watchedPathEntries = nil;
-    
 }