diff --git a/ui/browsing/playlistpage.go b/ui/browsing/playlistpage.go
index 898228d..b77c8d1 100644
--- a/ui/browsing/playlistpage.go
+++ b/ui/browsing/playlistpage.go
@@ -249,7 +249,6 @@ func NewPlaylistPageHeader(page *PlaylistPage) *PlaylistPageHeader {
 		a.page.pm.LoadTracks(a.page.tracks, false, false)
 		a.page.pm.PlayFromBeginning()
 	})
-	// TODO: find way to pad shuffle svg rather than using a space in the label string
 	shuffleBtn := widget.NewButtonWithIcon("Shuffle", myTheme.ShuffleIcon, func() {
 		a.page.pm.LoadTracks(a.page.tracks, false /*append*/, true /*shuffle*/)
 		a.page.pm.PlayFromBeginning()
diff --git a/ui/controller/controller.go b/ui/controller/controller.go
index 7146004..88f59ca 100644
--- a/ui/controller/controller.go
+++ b/ui/controller/controller.go
@@ -366,8 +366,6 @@ func (c *Controller) DoConnectToServerWorkflow(server *backend.ServerConfig) {
 }
 
 func (m *Controller) PromptForLoginAndConnect() {
-	// TODO: this will need to be rewritten a bit when we support multi servers
-	// need to make sure the intended server is first in the list passed to NewLoginDialog
 	d := dialogs.NewLoginDialog(m.App.Config.Servers, m.App.ServerManager.GetServerPassword)
 	pop := widget.NewModalPopUp(d, m.MainWindow.Canvas())
 	d.OnSubmit = func(server *backend.ServerConfig, password string) {