diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/RandomBy.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/RandomBy.cs
index 9856697..ae01174 100644
--- a/src/Core/Banshee.Services/Banshee.Collection.Database/RandomBy.cs
+++ b/src/Core/Banshee.Services/Banshee.Collection.Database/RandomBy.cs
@@ -40,8 +40,6 @@ namespace Banshee.Collection.Database
     public abstract class RandomBy
     {
         protected const string RANDOM_CONDITION = "AND LastStreamError = 0 AND (LastPlayedStamp < ? OR LastPlayedStamp IS NULL) AND (LastSkippedStamp < ? OR LastSkippedStamp IS NULL)";
-        //protected const string SHUFFLER_CONDITION = "AND LastStreamError = 0 AND (CoreShuffles.LastShuffledAt < ? OR CoreShuffles.LastShuffledAt IS NULL)";
-        // LEFT OUTER JOIN CoreShuffles ON (CoreShuffles.TrackID = CoreTracks.TrackID)
 
         protected DatabaseTrackListModel Model { get; private set; }
         protected IDatabaseTrackModelCache Cache { get; private set; }
diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/Shuffler.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/Shuffler.cs
index 6636462..b9bfab6 100644
--- a/src/Core/Banshee.Services/Banshee.Collection.Database/Shuffler.cs
+++ b/src/Core/Banshee.Services/Banshee.Collection.Database/Shuffler.cs
@@ -107,7 +107,7 @@ namespace Banshee.Collection.Database
                     r.Reset ();
                 }
             }
-            
+
             var random = randoms.First (r => r.Mode == mode);
             if (random != null) {
                 if (!random.IsReady) {
diff --git a/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs b/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs
index 3ef237b..931529f 100644
--- a/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs
+++ b/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs
@@ -576,14 +576,6 @@ namespace Banshee.PlayQueue
                         source_set_at, populate_mode, false, skip && i == 0, shuffler) as DatabaseTrackInfo;
 
                     if (track != null) {
-                        track.LastPlayed = DateTime.Now;
-                        // track.Save() is quite slow, update LastPlayedStamp directly in the database.
-                        ServiceManager.DbConnection.Execute (@"
-                            UPDATE CoreTracks
-                            SET LastPlayedStamp = ?
-                            WHERE TrackID = ?",
-                            Hyena.DateTimeUtil.ToTimeT (track.LastPlayed), track.TrackId
-                        );
                         EnqueueId (track.TrackId, false, true);
                     }
                 }
