diff --git a/cue/data/gen.cue b/cue/data/gen.cue
index c824da7294b..d793254ae2d 100644
--- a/cue/data/gen.cue
+++ b/cue/data/gen.cue
@@ -133,9 +133,13 @@ Family: scuemata.#Family & {
 
                     // The values depend on panel type
                     options: {...}
-
+                    libraryPanel?: {
+                        name: string,
+                        uid: string
+                    }
                     fieldConfig: {
                         defaults: {
+                            ...
                             // The display value for this field.  This supports template variables blank is auto
                             displayName?: string
 
diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go
index 20bd7adf518..8438a13c397 100644
--- a/pkg/api/dashboard.go
+++ b/pkg/api/dashboard.go
@@ -71,7 +71,6 @@ func (hs *HTTPServer) TrimDashboard(c *models.ReqContext, cmd models.TrimDashboa
 func (hs *HTTPServer) GetDashboard(c *models.ReqContext) response.Response {
 	slug := c.Params(":slug")
 	uid := c.Params(":uid")
-	trimDefaults := c.QueryBoolWithDefault("trimdefaults", false)
 	dash, rsp := getDashboardHelper(c.OrgId, slug, 0, uid)
 	if rsp != nil {
 		return rsp
@@ -176,15 +175,6 @@ func (hs *HTTPServer) GetDashboard(c *models.ReqContext) response.Response {
 		return response.Error(500, "Error while loading library panels", err)
 	}
 
-	var trimedJson simplejson.Json
-	if trimDefaults && !hs.LoadSchemaService.IsDisabled() {
-		trimedJson, err = hs.LoadSchemaService.DashboardTrimDefaults(*dash.Data)
-		if err != nil {
-			return response.Error(500, "Error while trim default value from dashboard json", err)
-		}
-		dash.Data = &trimedJson
-	}
-
 	dto := dtos.DashboardFullWithMeta{
 		Dashboard: dash.Data,
 		Meta:      meta,
@@ -285,13 +275,6 @@ func (hs *HTTPServer) PostDashboard(c *models.ReqContext, cmd models.SaveDashboa
 	var err error
 	cmd.OrgId = c.OrgId
 	cmd.UserId = c.UserId
-	trimDefaults := c.QueryBoolWithDefault("trimdefaults", false)
-	if trimDefaults && !hs.LoadSchemaService.IsDisabled() {
-		cmd.Dashboard, err = hs.LoadSchemaService.DashboardApplyDefaults(cmd.Dashboard)
-		if err != nil {
-			return response.Error(500, "Error while applying default value to the dashboard json", err)
-		}
-	}
 	dash := cmd.GetDashboardModel()
 	newDashboard := dash.Id == 0 && dash.Uid == ""
 	if newDashboard {
diff --git a/pkg/cmd/grafana-cli/commands/scuemata_validation_command_test.go b/pkg/cmd/grafana-cli/commands/scuemata_validation_command_test.go
index c73882cc985..2f9294daf99 100644
--- a/pkg/cmd/grafana-cli/commands/scuemata_validation_command_test.go
+++ b/pkg/cmd/grafana-cli/commands/scuemata_validation_command_test.go
@@ -110,7 +110,7 @@ func TestValidateScuemataBasics(t *testing.T) {
 					require.NoError(t, err, "failed to open dashboard file")
 
 					err = validateResources(b, baseLoadPaths, load.BaseDashboardFamily)
-					assert.EqualError(t, err, "failed validation: Family.lineages.0.0.panels.0.fieldConfig.defaults: field mappings not allowed")
+					assert.EqualError(t, err, "failed validation: Family.lineages.0.0.panels.0.type: incomplete value !=\"\"")
 				})
 			}