diff --git a/pkg/services/sqlstore/playlist_test.go b/pkg/services/sqlstore/playlist_test.go
index ef68c675e77..ba530f74fcf 100644
--- a/pkg/services/sqlstore/playlist_test.go
+++ b/pkg/services/sqlstore/playlist_test.go
@@ -8,35 +8,6 @@ import (
 	m "github.com/grafana/grafana/pkg/models"
 )
 
-/*
-type UpdatePlaylistCommand struct {
-	OrgId    int64             `json:"-"`
-	Id       int64             `json:"id" binding:"Required"`
-	Name     string            `json:"name" binding:"Required"`
-	Type     string            `json:"type"`
-	Interval string            `json:"interval"`
-	Items    []PlaylistItemDTO `json:"items"`
-
-	Result *PlaylistDTO
-}
-
-type CreatePlaylistCommand struct {
-	Name     string            `json:"name" binding:"Required"`
-	Interval string            `json:"interval"`
-	Data     []int64           `json:"data"`
-	Items    []PlaylistItemDTO `json:"items"`
-
-	OrgId  int64 `json:"-"`
-	Result *Playlist
-}
-
-type DeletePlaylistCommand struct {
-	Id    int64
-	OrgId int64
-}
-
-*/
-
 func TestPlaylistDataAccess(t *testing.T) {
 
 	Convey("Testing Playlist data access", t, func() {
@@ -44,8 +15,8 @@ func TestPlaylistDataAccess(t *testing.T) {
 
 		Convey("Can create playlist", func() {
 			items := []m.PlaylistItemDTO{
-				m.PlaylistItemDTO{Title: "graphite", Value: "graphite", Type: "dashboard_by_tag"},
-				m.PlaylistItemDTO{Title: "Backend response times", Value: "3", Type: "dashboard_by_id"},
+				{Title: "graphite", Value: "graphite", Type: "dashboard_by_tag"},
+				{Title: "Backend response times", Value: "3", Type: "dashboard_by_id"},
 			}
 			cmd := m.CreatePlaylistCommand{Name: "NYC office", Interval: "10m", OrgId: 1, Items: items}
 			err := CreatePlaylist(&cmd)
@@ -53,8 +24,8 @@ func TestPlaylistDataAccess(t *testing.T) {
 
 			Convey("can update playlist", func() {
 				items := []m.PlaylistItemDTO{
-					m.PlaylistItemDTO{Title: "influxdb", Value: "influxdb", Type: "dashboard_by_tag"},
-					m.PlaylistItemDTO{Title: "Backend response times", Value: "2", Type: "dashboard_by_id"},
+					{Title: "influxdb", Value: "influxdb", Type: "dashboard_by_tag"},
+					{Title: "Backend response times", Value: "2", Type: "dashboard_by_id"},
 				}
 				query := m.UpdatePlaylistCommand{Name: "NYC office ", OrgId: 1, Id: 1, Interval: "10s", Items: items}
 				err = UpdatePlaylist(&query)