diff --git a/Application/PlaybackController.m b/Application/PlaybackController.m
index 4ac27f3e6..c11a5b1de 100644
--- a/Application/PlaybackController.m
+++ b/Application/PlaybackController.m
@@ -153,16 +153,11 @@
 
 - (IBAction)next:(id)sender
 {
-	DBLog(@"CALLING: %i %i", playbackStatus, kCogStatusStopped);
 	if ([playlistController next] == NO)
 		return;
 
-	if (playbackStatus != kCogStatusStopped)
-	{
-		DBLog(@"STOPPING");
-		[self stop:self];
-		[self playEntry:[playlistController currentEntry]];
-	}
+	[self stop:self];
+	[self playEntry:[playlistController currentEntry]];
 }
 
 - (IBAction)prev:(id)sender
@@ -171,11 +166,8 @@
 	if ([playlistController prev] == nil)
 		return;
 
-	if (playbackStatus != kCogStatusStopped)
-	{
-		[self stop:self];
-		[self playEntry:[playlistController currentEntry]];
-	}
+	[self stop:self];
+	[self playEntry:[playlistController currentEntry]];
 }
 
 - (IBAction)seek:(id)sender
diff --git a/TODO b/TODO
index c8fc7feac..659070656 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,2 @@
-Move all version numbering over to the SVN system. Use long/short version for display in about.
 PLS icon.
 Incubate.