diff --git a/src/Menus.cpp b/src/Menus.cpp
index cf8e9d821..95f15c120 100644
--- a/src/Menus.cpp
+++ b/src/Menus.cpp
@@ -6048,7 +6048,7 @@ int AudacityProject::FindClips(double t0, double t1, bool next, std::vector<Foun
 
    bool anyWaveTracksSelected =
       tracks->end() != std::find_if(tracks->begin(), tracks->end(),
-         [] (const movable_ptr<Track>& t) {
+         [] (const std::shared_ptr<Track>& t) {
             return t->GetSelected() && t->GetKind() == Track::Wave; });
 
    // first search the tracks individually
@@ -6136,7 +6136,7 @@ void AudacityProject::OnSelectClip(bool next)
          if (nTracksSearched > 1) {
             if (result.waveTrack->GetName() == result.waveTrack->GetDefaultName()) {
                auto track = std::find_if(GetTracks()->begin(), GetTracks()->end(),
-                  [&] (const movable_ptr<Track>& t) { return t.get() == result.waveTrack; });
+                  [&] (const std::shared_ptr<Track>& t) { return t.get() == result.waveTrack; });
                temp.Printf(wxT("%s %d "), _("Track"), std::distance(GetTracks()->begin(), track) + 1);
             }
             else
@@ -7115,7 +7115,7 @@ int AudacityProject::FindClipBoundaries(double time, bool next, std::vector<Foun
 
    bool anyWaveTracksSelected =
       tracks->end() != std::find_if(tracks->begin(), tracks->end(),
-         [] (const movable_ptr<Track>& t) {
+         [] (const std::shared_ptr<Track>& t) {
             return t->GetSelected() && t->GetKind() == Track::Wave; });
 
    // first search the tracks individually
@@ -7188,7 +7188,7 @@ wxString AudacityProject::ClipBoundaryMessage(int nTracksSearched, const std::ve
       if (nTracksSearched > 1) {
          if (result.waveTrack->GetName() == result.waveTrack->GetDefaultName()) {
             auto track = std::find_if(GetTracks()->begin(), GetTracks()->end(),
-               [&] (const movable_ptr<Track>& t) { return t.get() == result.waveTrack; });
+               [&] (const std::shared_ptr<Track>& t) { return t.get() == result.waveTrack; });
             temp.Printf(wxT("%s %d "), _("Track"), std::distance(GetTracks()->begin(), track) + 1);
          }
          else 
diff --git a/src/Track.cpp b/src/Track.cpp
index e353980bb..68c54b0c2 100644
--- a/src/Track.cpp
+++ b/src/Track.cpp
@@ -933,8 +933,6 @@ Track *TrackList::AddToHead(std::unique_ptr<TrackKind> &&t)
 // Make instantiations for the linker to find
 template Track *TrackList::AddToHead<TimeTrack>(std::unique_ptr<TimeTrack> &&);
 
-#ifdef __AUDACITY_OLD_STD__
-
 template<typename TrackKind>
 Track *TrackList::Add(std::shared_ptr<TrackKind> &&t)
 {
@@ -951,8 +949,6 @@ Track *TrackList::Add(std::shared_ptr<TrackKind> &&t)
 template Track *TrackList::Add<Track>(std::shared_ptr<Track> &&);
 template Track *TrackList::Add<WaveTrack>(std::shared_ptr<WaveTrack> &&);
 
-#endif
-
 auto TrackList::Replace(Track * t, value_type &&with) -> value_type
 {
    value_type holder;
diff --git a/src/Track.h b/src/Track.h
index 09835069f..cf99dc71a 100644
--- a/src/Track.h
+++ b/src/Track.h
@@ -72,7 +72,7 @@ class NoteTrack;
 
 class TrackList;
 
-using ListOfTracks = std::list<movable_ptr<Track>>;
+using ListOfTracks = std::list< std::shared_ptr< Track > >;
 
 using TrackNodePointer = ListOfTracks::iterator;
 
@@ -515,10 +515,8 @@ class TrackList final : public wxEvtHandler, public ListOfTracks
    template<typename TrackKind>
    Track *AddToHead(std::unique_ptr<TrackKind> &&t);
 
-#ifdef __AUDACITY_OLD_STD__
    template<typename TrackKind>
    Track *Add(std::shared_ptr<TrackKind> &&t);
-#endif
 
    /// Replace first track with second track, give back a holder
    value_type Replace(Track * t, value_type &&with);
diff --git a/src/effects/Effect.h b/src/effects/Effect.h
index 118e15552..bf12dd5c3 100644
--- a/src/effects/Effect.h
+++ b/src/effects/Effect.h
@@ -415,7 +415,7 @@ protected:
    private:
       Effect *mpEffect{};
       LabelTrack *mpTrack{};
-      movable_ptr<Track> mpOrigTrack{};
+      std::shared_ptr<Track> mpOrigTrack{};
    };
 
    // Set name to given value if that is not empty, else use default name