diff --git a/app/model.py b/app/model.py
index 48cf5b7..e5af8e2 100644
--- a/app/model.py
+++ b/app/model.py
@@ -168,7 +168,15 @@ class Playlists(Base):
 
         return session.query(Playlists).filter(Playlists.id == plid).one()
 
-    def add_track(self, track, row):
+    def add_track(self, track, row=None):
+        """
+        Add track to playlist at given row.
+        If row=None, add to end of playlist
+        """
+
+        if not row:
+            row = PlaylistTracks.new_row(self.id)
+
         glue = PlaylistTracks(row=row)
         glue.track_id = track.id
         self.tracks.append(glue)
@@ -220,14 +228,6 @@ class PlaylistTracks(Base):
         plt.row = new_row
         session.commit()
 
-    @staticmethod
-    def remove_track(playlist_id, track_id):
-        DEBUG(f"remove_track({playlist_id}, {track_id})")
-        session.query(PlaylistTracks).filter(
-            PlaylistTracks.playlist_id == playlist_id,
-            PlaylistTracks.track_id == track_id
-        ).delete()
-
 
 class Settings(Base):
     __tablename__ = 'settings'