diff --git a/clients/flickr/types.go b/clients/flickr/types.go
index 91d3bbd11a..bff2e20d33 100644
--- a/clients/flickr/types.go
+++ b/clients/flickr/types.go
@@ -49,7 +49,6 @@ type User struct {
 
 func NewUser() User {
 	return User{types.NewMap(
-		types.NewString("$type"), types.MakeTypeRef(__mainPackageInFile_types_CachedRef, 0),
 		types.NewString("Id"), types.NewString(""),
 		types.NewString("Name"), types.NewString(""),
 		types.NewString("OAuthToken"), types.NewString(""),
@@ -149,7 +148,6 @@ type Album struct {
 
 func NewAlbum() Album {
 	return Album{types.NewMap(
-		types.NewString("$type"), types.MakeTypeRef(__mainPackageInFile_types_CachedRef, 1),
 		types.NewString("Id"), types.NewString(""),
 		types.NewString("Title"), types.NewString(""),
 		types.NewString("Photos"), NewSetOfsha1_b525f9bca5e451c21dd9af564f0960045fbaa304_RemotePhoto(),
diff --git a/clients/gen/sha1_b525f9bca5e451c21dd9af564f0960045fbaa304/sha1_b525f9bca5e451c21dd9af564f0960045fbaa304.go b/clients/gen/sha1_b525f9bca5e451c21dd9af564f0960045fbaa304/sha1_b525f9bca5e451c21dd9af564f0960045fbaa304.go
index f377dfb964..a4f747ca8e 100644
--- a/clients/gen/sha1_b525f9bca5e451c21dd9af564f0960045fbaa304/sha1_b525f9bca5e451c21dd9af564f0960045fbaa304.go
+++ b/clients/gen/sha1_b525f9bca5e451c21dd9af564f0960045fbaa304/sha1_b525f9bca5e451c21dd9af564f0960045fbaa304.go
@@ -49,7 +49,6 @@ type RemotePhoto struct {
 
 func NewRemotePhoto() RemotePhoto {
 	return RemotePhoto{types.NewMap(
-		types.NewString("$type"), types.MakeTypeRef(__sha1_b525f9bca5e451c21dd9af564f0960045fbaa304PackageInFile_sha1_b525f9bca5e451c21dd9af564f0960045fbaa304_CachedRef, 0),
 		types.NewString("Id"), types.NewString(""),
 		types.NewString("Title"), types.NewString(""),
 		types.NewString("Url"), types.NewString(""),
@@ -71,7 +70,6 @@ type RemotePhotoDef struct {
 func (def RemotePhotoDef) New() RemotePhoto {
 	return RemotePhoto{
 		types.NewMap(
-			types.NewString("$type"), types.MakeTypeRef(__sha1_b525f9bca5e451c21dd9af564f0960045fbaa304PackageInFile_sha1_b525f9bca5e451c21dd9af564f0960045fbaa304_CachedRef, 0),
 			types.NewString("Id"), types.NewString(def.Id),
 			types.NewString("Title"), types.NewString(def.Title),
 			types.NewString("Url"), types.NewString(def.Url),
@@ -190,7 +188,6 @@ type Size struct {
 
 func NewSize() Size {
 	return Size{types.NewMap(
-		types.NewString("$type"), types.MakeTypeRef(__sha1_b525f9bca5e451c21dd9af564f0960045fbaa304PackageInFile_sha1_b525f9bca5e451c21dd9af564f0960045fbaa304_CachedRef, 1),
 		types.NewString("Width"), types.UInt32(0),
 		types.NewString("Height"), types.UInt32(0),
 	), &ref.Ref{}}
@@ -204,7 +201,6 @@ type SizeDef struct {
 func (def SizeDef) New() Size {
 	return Size{
 		types.NewMap(
-			types.NewString("$type"), types.MakeTypeRef(__sha1_b525f9bca5e451c21dd9af564f0960045fbaa304PackageInFile_sha1_b525f9bca5e451c21dd9af564f0960045fbaa304_CachedRef, 1),
 			types.NewString("Width"), types.UInt32(def.Width),
 			types.NewString("Height"), types.UInt32(def.Height),
 		), &ref.Ref{}}
diff --git a/clients/gen/sha1_fb09d21d144c518467325465327d46489cff7c47/sha1_fb09d21d144c518467325465327d46489cff7c47.go b/clients/gen/sha1_fb09d21d144c518467325465327d46489cff7c47/sha1_fb09d21d144c518467325465327d46489cff7c47.go
index 574e09ae83..c5559284ac 100644
--- a/clients/gen/sha1_fb09d21d144c518467325465327d46489cff7c47/sha1_fb09d21d144c518467325465327d46489cff7c47.go
+++ b/clients/gen/sha1_fb09d21d144c518467325465327d46489cff7c47/sha1_fb09d21d144c518467325465327d46489cff7c47.go
@@ -41,7 +41,6 @@ type Geoposition struct {
 
 func NewGeoposition() Geoposition {
 	return Geoposition{types.NewMap(
-		types.NewString("$type"), types.MakeTypeRef(__sha1_fb09d21d144c518467325465327d46489cff7c47PackageInFile_sha1_fb09d21d144c518467325465327d46489cff7c47_CachedRef, 0),
 		types.NewString("Latitude"), types.Float32(0),
 		types.NewString("Longitude"), types.Float32(0),
 	), &ref.Ref{}}
@@ -55,7 +54,6 @@ type GeopositionDef struct {
 func (def GeopositionDef) New() Geoposition {
 	return Geoposition{
 		types.NewMap(
-			types.NewString("$type"), types.MakeTypeRef(__sha1_fb09d21d144c518467325465327d46489cff7c47PackageInFile_sha1_fb09d21d144c518467325465327d46489cff7c47_CachedRef, 0),
 			types.NewString("Latitude"), types.Float32(def.Latitude),
 			types.NewString("Longitude"), types.Float32(def.Longitude),
 		), &ref.Ref{}}
@@ -134,7 +132,6 @@ type Georectangle struct {
 
 func NewGeorectangle() Georectangle {
 	return Georectangle{types.NewMap(
-		types.NewString("$type"), types.MakeTypeRef(__sha1_fb09d21d144c518467325465327d46489cff7c47PackageInFile_sha1_fb09d21d144c518467325465327d46489cff7c47_CachedRef, 1),
 		types.NewString("TopLeft"), NewGeoposition(),
 		types.NewString("BottomRight"), NewGeoposition(),
 	), &ref.Ref{}}
@@ -148,7 +145,6 @@ type GeorectangleDef struct {
 func (def GeorectangleDef) New() Georectangle {
 	return Georectangle{
 		types.NewMap(
-			types.NewString("$type"), types.MakeTypeRef(__sha1_fb09d21d144c518467325465327d46489cff7c47PackageInFile_sha1_fb09d21d144c518467325465327d46489cff7c47_CachedRef, 1),
 			types.NewString("TopLeft"), def.TopLeft.New(),
 			types.NewString("BottomRight"), def.BottomRight.New(),
 		), &ref.Ref{}}
diff --git a/clients/music/mp3_importer/types.go b/clients/music/mp3_importer/types.go
index 148472ba67..d5e12ff4c5 100644
--- a/clients/music/mp3_importer/types.go
+++ b/clients/music/mp3_importer/types.go
@@ -37,7 +37,6 @@ type Song struct {
 
 func NewSong() Song {
 	return Song{types.NewMap(
-		types.NewString("$type"), types.MakeTypeRef(__mainPackageInFile_types_CachedRef, 0),
 		types.NewString("Title"), types.NewString(""),
 		types.NewString("Artist"), types.NewString(""),
 		types.NewString("Album"), types.NewString(""),
@@ -57,7 +56,6 @@ type SongDef struct {
 func (def SongDef) New() Song {
 	return Song{
 		types.NewMap(
-			types.NewString("$type"), types.MakeTypeRef(__mainPackageInFile_types_CachedRef, 0),
 			types.NewString("Title"), types.NewString(def.Title),
 			types.NewString("Artist"), types.NewString(def.Artist),
 			types.NewString("Album"), types.NewString(def.Album),
diff --git a/clients/pitchmap/index/types.go b/clients/pitchmap/index/types.go
index 2975f12ed7..7ca0955430 100644
--- a/clients/pitchmap/index/types.go
+++ b/clients/pitchmap/index/types.go
@@ -34,7 +34,6 @@ type Pitch struct {
 
 func NewPitch() Pitch {
 	return Pitch{types.NewMap(
-		types.NewString("$type"), types.MakeTypeRef(__mainPackageInFile_types_CachedRef, 0),
 		types.NewString("X"), types.Float64(0),
 		types.NewString("Z"), types.Float64(0),
 	), &ref.Ref{}}
@@ -48,7 +47,6 @@ type PitchDef struct {
 func (def PitchDef) New() Pitch {
 	return Pitch{
 		types.NewMap(
-			types.NewString("$type"), types.MakeTypeRef(__mainPackageInFile_types_CachedRef, 0),
 			types.NewString("X"), types.Float64(def.X),
 			types.NewString("Z"), types.Float64(def.Z),
 		), &ref.Ref{}}
diff --git a/clients/quad_tree/types.go b/clients/quad_tree/types.go
index 6f18232fe6..79f00ddd3a 100644
--- a/clients/quad_tree/types.go
+++ b/clients/quad_tree/types.go
@@ -61,7 +61,6 @@ type Node struct {
 
 func NewNode() Node {
 	return Node{types.NewMap(
-		types.NewString("$type"), types.MakeTypeRef(__mainPackageInFile_types_CachedRef, 0),
 		types.NewString("Geoposition"), sha1_fb09d21d144c518467325465327d46489cff7c47.NewGeoposition(),
 		types.NewString("Reference"), NewRefOfValue(ref.Ref{}),
 	), &ref.Ref{}}
@@ -75,7 +74,6 @@ type NodeDef struct {
 func (def NodeDef) New() Node {
 	return Node{
 		types.NewMap(
-			types.NewString("$type"), types.MakeTypeRef(__mainPackageInFile_types_CachedRef, 0),
 			types.NewString("Geoposition"), def.Geoposition.New(),
 			types.NewString("Reference"), NewRefOfValue(def.Reference),
 		), &ref.Ref{}}
@@ -154,7 +152,6 @@ type QuadTree struct {
 
 func NewQuadTree() QuadTree {
 	return QuadTree{types.NewMap(
-		types.NewString("$type"), types.MakeTypeRef(__mainPackageInFile_types_CachedRef, 1),
 		types.NewString("Nodes"), NewListOfNode(),
 		types.NewString("Tiles"), NewMapOfStringToQuadTree(),
 		types.NewString("Depth"), types.UInt8(0),
@@ -176,7 +173,6 @@ type QuadTreeDef struct {
 func (def QuadTreeDef) New() QuadTree {
 	return QuadTree{
 		types.NewMap(
-			types.NewString("$type"), types.MakeTypeRef(__mainPackageInFile_types_CachedRef, 1),
 			types.NewString("Nodes"), def.Nodes.New(),
 			types.NewString("Tiles"), def.Tiles.New(),
 			types.NewString("Depth"), types.UInt8(def.Depth),
@@ -295,7 +291,6 @@ type SQuadTree struct {
 
 func NewSQuadTree() SQuadTree {
 	return SQuadTree{types.NewMap(
-		types.NewString("$type"), types.MakeTypeRef(__mainPackageInFile_types_CachedRef, 2),
 		types.NewString("Nodes"), NewListOfRefOfValue(),
 		types.NewString("Tiles"), NewMapOfStringToRefOfSQuadTree(),
 		types.NewString("Depth"), types.UInt8(0),
@@ -317,7 +312,6 @@ type SQuadTreeDef struct {
 func (def SQuadTreeDef) New() SQuadTree {
 	return SQuadTree{
 		types.NewMap(
-			types.NewString("$type"), types.MakeTypeRef(__mainPackageInFile_types_CachedRef, 2),
 			types.NewString("Nodes"), def.Nodes.New(),
 			types.NewString("Tiles"), def.Tiles.New(),
 			types.NewString("Depth"), types.UInt8(def.Depth),
diff --git a/clients/sfcrime_importer/types.go b/clients/sfcrime_importer/types.go
index 5916bccde6..42f894a0f6 100644
--- a/clients/sfcrime_importer/types.go
+++ b/clients/sfcrime_importer/types.go
@@ -47,7 +47,6 @@ type Incident struct {
 
 func NewIncident() Incident {
 	return Incident{types.NewMap(
-		types.NewString("$type"), types.MakeTypeRef(__mainPackageInFile_types_CachedRef, 0),
 		types.NewString("ID"), types.Int64(0),
 		types.NewString("Category"), types.NewString(""),
 		types.NewString("Description"), types.NewString(""),
@@ -79,7 +78,6 @@ type IncidentDef struct {
 func (def IncidentDef) New() Incident {
 	return Incident{
 		types.NewMap(
-			types.NewString("$type"), types.MakeTypeRef(__mainPackageInFile_types_CachedRef, 0),
 			types.NewString("ID"), types.Int64(def.ID),
 			types.NewString("Category"), types.NewString(def.Category),
 			types.NewString("Description"), types.NewString(def.Description),
diff --git a/clients/sfcrime_search/types.go b/clients/sfcrime_search/types.go
index bf56d5c063..871b5babff 100644
--- a/clients/sfcrime_search/types.go
+++ b/clients/sfcrime_search/types.go
@@ -52,7 +52,6 @@ type Incident struct {
 
 func NewIncident() Incident {
 	return Incident{types.NewMap(
-		types.NewString("$type"), types.MakeTypeRef(__mainPackageInFile_types_CachedRef, 0),
 		types.NewString("Category"), types.NewString(""),
 		types.NewString("Description"), types.NewString(""),
 		types.NewString("Address"), types.NewString(""),
@@ -72,7 +71,6 @@ type IncidentDef struct {
 func (def IncidentDef) New() Incident {
 	return Incident{
 		types.NewMap(
-			types.NewString("$type"), types.MakeTypeRef(__mainPackageInFile_types_CachedRef, 0),
 			types.NewString("Category"), types.NewString(def.Category),
 			types.NewString("Description"), types.NewString(def.Description),
 			types.NewString("Address"), types.NewString(def.Address),
@@ -181,7 +179,6 @@ type SQuadTree struct {
 
 func NewSQuadTree() SQuadTree {
 	return SQuadTree{types.NewMap(
-		types.NewString("$type"), types.MakeTypeRef(__mainPackageInFile_types_CachedRef, 1),
 		types.NewString("Nodes"), NewListOfIncident(),
 		types.NewString("Tiles"), NewMapOfStringToSQuadTree(),
 		types.NewString("Depth"), types.UInt8(0),
@@ -203,7 +200,6 @@ type SQuadTreeDef struct {
 func (def SQuadTreeDef) New() SQuadTree {
 	return SQuadTree{
 		types.NewMap(
-			types.NewString("$type"), types.MakeTypeRef(__mainPackageInFile_types_CachedRef, 1),
 			types.NewString("Nodes"), def.Nodes.New(),
 			types.NewString("Tiles"), def.Tiles.New(),
 			types.NewString("Depth"), types.UInt8(def.Depth),
diff --git a/datas/types.go b/datas/types.go
index c01358aca2..a676b0e05b 100644
--- a/datas/types.go
+++ b/datas/types.go
@@ -35,7 +35,6 @@ type Commit struct {
 
 func NewCommit() Commit {
 	return Commit{types.NewMap(
-		types.NewString("$type"), types.MakeTypeRef(__datasPackageInFile_types_CachedRef, 0),
 		types.NewString("value"), types.Bool(false),
 		types.NewString("parents"), NewSetOfRefOfCommit(),
 	), &ref.Ref{}}
@@ -49,7 +48,6 @@ type CommitDef struct {
 func (def CommitDef) New() Commit {
 	return Commit{
 		types.NewMap(
-			types.NewString("$type"), types.MakeTypeRef(__datasPackageInFile_types_CachedRef, 0),
 			types.NewString("value"), def.Value,
 			types.NewString("parents"), def.Parents.New(),
 		), &ref.Ref{}}
diff --git a/nomdl/codegen/test/enum_struct.go b/nomdl/codegen/test/enum_struct.go
index 118142ffd6..f0fb7f1158 100644
--- a/nomdl/codegen/test/enum_struct.go
+++ b/nomdl/codegen/test/enum_struct.go
@@ -44,7 +44,6 @@ type EnumStruct struct {
 
 func NewEnumStruct() EnumStruct {
 	return EnumStruct{types.NewMap(
-		types.NewString("$type"), types.MakeTypeRef(__testPackageInFile_enum_struct_CachedRef, 1),
 		types.NewString("hand"), types.UInt32(0),
 	), &ref.Ref{}}
 }
@@ -56,7 +55,6 @@ type EnumStructDef struct {
 func (def EnumStructDef) New() EnumStruct {
 	return EnumStruct{
 		types.NewMap(
-			types.NewString("$type"), types.MakeTypeRef(__testPackageInFile_enum_struct_CachedRef, 1),
 			types.NewString("hand"), types.UInt32(def.Hand),
 		), &ref.Ref{}}
 }
diff --git a/nomdl/codegen/test/gen/sha1_bbf9c3d7eb6ed891f4b8490b5b81f21f89f7d288/sha1_bbf9c3d7eb6ed891f4b8490b5b81f21f89f7d288.go b/nomdl/codegen/test/gen/sha1_bbf9c3d7eb6ed891f4b8490b5b81f21f89f7d288/sha1_bbf9c3d7eb6ed891f4b8490b5b81f21f89f7d288.go
index 1a736b4bc4..1af38c8385 100644
--- a/nomdl/codegen/test/gen/sha1_bbf9c3d7eb6ed891f4b8490b5b81f21f89f7d288/sha1_bbf9c3d7eb6ed891f4b8490b5b81f21f89f7d288.go
+++ b/nomdl/codegen/test/gen/sha1_bbf9c3d7eb6ed891f4b8490b5b81f21f89f7d288/sha1_bbf9c3d7eb6ed891f4b8490b5b81f21f89f7d288.go
@@ -35,7 +35,6 @@ type S struct {
 
 func NewS() S {
 	return S{types.NewMap(
-		types.NewString("$type"), types.MakeTypeRef(__sha1_bbf9c3d7eb6ed891f4b8490b5b81f21f89f7d288PackageInFile_sha1_bbf9c3d7eb6ed891f4b8490b5b81f21f89f7d288_CachedRef, 0),
 		types.NewString("s"), types.NewString(""),
 		types.NewString("b"), types.Bool(false),
 	), &ref.Ref{}}
@@ -49,7 +48,6 @@ type SDef struct {
 func (def SDef) New() S {
 	return S{
 		types.NewMap(
-			types.NewString("$type"), types.MakeTypeRef(__sha1_bbf9c3d7eb6ed891f4b8490b5b81f21f89f7d288PackageInFile_sha1_bbf9c3d7eb6ed891f4b8490b5b81f21f89f7d288_CachedRef, 0),
 			types.NewString("s"), types.NewString(def.S),
 			types.NewString("b"), types.Bool(def.B),
 		), &ref.Ref{}}
diff --git a/nomdl/codegen/test/gen/sha1_d31b592f480b7659b03b72a7d1271f31dde57b2d/sha1_d31b592f480b7659b03b72a7d1271f31dde57b2d.go b/nomdl/codegen/test/gen/sha1_d31b592f480b7659b03b72a7d1271f31dde57b2d/sha1_d31b592f480b7659b03b72a7d1271f31dde57b2d.go
index e2bd21212d..76505e1d04 100644
--- a/nomdl/codegen/test/gen/sha1_d31b592f480b7659b03b72a7d1271f31dde57b2d/sha1_d31b592f480b7659b03b72a7d1271f31dde57b2d.go
+++ b/nomdl/codegen/test/gen/sha1_d31b592f480b7659b03b72a7d1271f31dde57b2d/sha1_d31b592f480b7659b03b72a7d1271f31dde57b2d.go
@@ -44,7 +44,6 @@ type D struct {
 
 func NewD() D {
 	return D{types.NewMap(
-		types.NewString("$type"), types.MakeTypeRef(__sha1_d31b592f480b7659b03b72a7d1271f31dde57b2dPackageInFile_sha1_d31b592f480b7659b03b72a7d1271f31dde57b2d_CachedRef, 0),
 		types.NewString("structField"), sha1_bbf9c3d7eb6ed891f4b8490b5b81f21f89f7d288.NewS(),
 		types.NewString("enumField"), types.UInt32(0),
 	), &ref.Ref{}}
@@ -58,7 +57,6 @@ type DDef struct {
 func (def DDef) New() D {
 	return D{
 		types.NewMap(
-			types.NewString("$type"), types.MakeTypeRef(__sha1_d31b592f480b7659b03b72a7d1271f31dde57b2dPackageInFile_sha1_d31b592f480b7659b03b72a7d1271f31dde57b2d_CachedRef, 0),
 			types.NewString("structField"), def.StructField.New(),
 			types.NewString("enumField"), types.UInt32(def.EnumField),
 		), &ref.Ref{}}
@@ -137,7 +135,6 @@ type DUser struct {
 
 func NewDUser() DUser {
 	return DUser{types.NewMap(
-		types.NewString("$type"), types.MakeTypeRef(__sha1_d31b592f480b7659b03b72a7d1271f31dde57b2dPackageInFile_sha1_d31b592f480b7659b03b72a7d1271f31dde57b2d_CachedRef, 1),
 		types.NewString("Dfield"), NewD(),
 	), &ref.Ref{}}
 }
@@ -149,7 +146,6 @@ type DUserDef struct {
 func (def DUserDef) New() DUser {
 	return DUser{
 		types.NewMap(
-			types.NewString("$type"), types.MakeTypeRef(__sha1_d31b592f480b7659b03b72a7d1271f31dde57b2dPackageInFile_sha1_d31b592f480b7659b03b72a7d1271f31dde57b2d_CachedRef, 1),
 			types.NewString("Dfield"), def.Dfield.New(),
 		), &ref.Ref{}}
 }
diff --git a/nomdl/codegen/test/ref.go b/nomdl/codegen/test/ref.go
index 77d5d53ab8..ad655326b3 100644
--- a/nomdl/codegen/test/ref.go
+++ b/nomdl/codegen/test/ref.go
@@ -34,7 +34,6 @@ type StructWithRef struct {
 
 func NewStructWithRef() StructWithRef {
 	return StructWithRef{types.NewMap(
-		types.NewString("$type"), types.MakeTypeRef(__testPackageInFile_ref_CachedRef, 0),
 		types.NewString("r"), NewRefOfSetOfFloat32(ref.Ref{}),
 	), &ref.Ref{}}
 }
@@ -46,7 +45,6 @@ type StructWithRefDef struct {
 func (def StructWithRefDef) New() StructWithRef {
 	return StructWithRef{
 		types.NewMap(
-			types.NewString("$type"), types.MakeTypeRef(__testPackageInFile_ref_CachedRef, 0),
 			types.NewString("r"), NewRefOfSetOfFloat32(def.R),
 		), &ref.Ref{}}
 }
diff --git a/nomdl/codegen/test/struct.go b/nomdl/codegen/test/struct.go
index 0ae2125af6..163176f0a3 100644
--- a/nomdl/codegen/test/struct.go
+++ b/nomdl/codegen/test/struct.go
@@ -34,7 +34,6 @@ type Struct struct {
 
 func NewStruct() Struct {
 	return Struct{types.NewMap(
-		types.NewString("$type"), types.MakeTypeRef(__testPackageInFile_struct_CachedRef, 0),
 		types.NewString("s"), types.NewString(""),
 		types.NewString("b"), types.Bool(false),
 	), &ref.Ref{}}
@@ -48,7 +47,6 @@ type StructDef struct {
 func (def StructDef) New() Struct {
 	return Struct{
 		types.NewMap(
-			types.NewString("$type"), types.MakeTypeRef(__testPackageInFile_struct_CachedRef, 0),
 			types.NewString("s"), types.NewString(def.S),
 			types.NewString("b"), types.Bool(def.B),
 		), &ref.Ref{}}
diff --git a/nomdl/codegen/test/struct_optional.go b/nomdl/codegen/test/struct_optional.go
index d28bfa8897..4da0f6bef8 100644
--- a/nomdl/codegen/test/struct_optional.go
+++ b/nomdl/codegen/test/struct_optional.go
@@ -33,9 +33,7 @@ type OptionalStruct struct {
 }
 
 func NewOptionalStruct() OptionalStruct {
-	return OptionalStruct{types.NewMap(
-		types.NewString("$type"), types.MakeTypeRef(__testPackageInFile_struct_optional_CachedRef, 0),
-	), &ref.Ref{}}
+	return OptionalStruct{types.NewMap(), &ref.Ref{}}
 }
 
 type OptionalStructDef struct {
@@ -46,7 +44,6 @@ type OptionalStructDef struct {
 func (def OptionalStructDef) New() OptionalStruct {
 	return OptionalStruct{
 		types.NewMap(
-			types.NewString("$type"), types.MakeTypeRef(__testPackageInFile_struct_optional_CachedRef, 0),
 			types.NewString("s"), types.NewString(def.S),
 			types.NewString("b"), types.Bool(def.B),
 		), &ref.Ref{}}
diff --git a/nomdl/codegen/test/struct_primitives.go b/nomdl/codegen/test/struct_primitives.go
index 56eb286b32..7e33a5fe64 100644
--- a/nomdl/codegen/test/struct_primitives.go
+++ b/nomdl/codegen/test/struct_primitives.go
@@ -46,7 +46,6 @@ type StructPrimitives struct {
 
 func NewStructPrimitives() StructPrimitives {
 	return StructPrimitives{types.NewMap(
-		types.NewString("$type"), types.MakeTypeRef(__testPackageInFile_struct_primitives_CachedRef, 0),
 		types.NewString("uint64"), types.UInt64(0),
 		types.NewString("uint32"), types.UInt32(0),
 		types.NewString("uint16"), types.UInt16(0),
@@ -84,7 +83,6 @@ type StructPrimitivesDef struct {
 func (def StructPrimitivesDef) New() StructPrimitives {
 	return StructPrimitives{
 		types.NewMap(
-			types.NewString("$type"), types.MakeTypeRef(__testPackageInFile_struct_primitives_CachedRef, 0),
 			types.NewString("uint64"), types.UInt64(def.Uint64),
 			types.NewString("uint32"), types.UInt32(def.Uint32),
 			types.NewString("uint16"), types.UInt16(def.Uint16),
diff --git a/nomdl/codegen/test/struct_recursive.go b/nomdl/codegen/test/struct_recursive.go
index 0d3b8c7179..c9e9baadbe 100644
--- a/nomdl/codegen/test/struct_recursive.go
+++ b/nomdl/codegen/test/struct_recursive.go
@@ -33,7 +33,6 @@ type Tree struct {
 
 func NewTree() Tree {
 	return Tree{types.NewMap(
-		types.NewString("$type"), types.MakeTypeRef(__testPackageInFile_struct_recursive_CachedRef, 0),
 		types.NewString("children"), NewListOfTree(),
 	), &ref.Ref{}}
 }
@@ -45,7 +44,6 @@ type TreeDef struct {
 func (def TreeDef) New() Tree {
 	return Tree{
 		types.NewMap(
-			types.NewString("$type"), types.MakeTypeRef(__testPackageInFile_struct_recursive_CachedRef, 0),
 			types.NewString("children"), def.Children.New(),
 		), &ref.Ref{}}
 }
diff --git a/nomdl/codegen/test/struct_with_imports.go b/nomdl/codegen/test/struct_with_imports.go
index 6079f91a2a..68ad9f1923 100644
--- a/nomdl/codegen/test/struct_with_imports.go
+++ b/nomdl/codegen/test/struct_with_imports.go
@@ -48,7 +48,6 @@ type ImportUser struct {
 
 func NewImportUser() ImportUser {
 	return ImportUser{types.NewMap(
-		types.NewString("$type"), types.MakeTypeRef(__testPackageInFile_struct_with_imports_CachedRef, 1),
 		types.NewString("importedStruct"), sha1_d31b592f480b7659b03b72a7d1271f31dde57b2d.NewD(),
 		types.NewString("enum"), types.UInt32(0),
 	), &ref.Ref{}}
@@ -62,7 +61,6 @@ type ImportUserDef struct {
 func (def ImportUserDef) New() ImportUser {
 	return ImportUser{
 		types.NewMap(
-			types.NewString("$type"), types.MakeTypeRef(__testPackageInFile_struct_with_imports_CachedRef, 1),
 			types.NewString("importedStruct"), def.ImportedStruct.New(),
 			types.NewString("enum"), types.UInt32(def.Enum),
 		), &ref.Ref{}}
diff --git a/nomdl/codegen/test/struct_with_list.go b/nomdl/codegen/test/struct_with_list.go
index 6ff7abe8fb..2323be1a19 100644
--- a/nomdl/codegen/test/struct_with_list.go
+++ b/nomdl/codegen/test/struct_with_list.go
@@ -36,7 +36,6 @@ type StructWithList struct {
 
 func NewStructWithList() StructWithList {
 	return StructWithList{types.NewMap(
-		types.NewString("$type"), types.MakeTypeRef(__testPackageInFile_struct_with_list_CachedRef, 0),
 		types.NewString("l"), NewListOfUInt8(),
 		types.NewString("b"), types.Bool(false),
 		types.NewString("s"), types.NewString(""),
@@ -54,7 +53,6 @@ type StructWithListDef struct {
 func (def StructWithListDef) New() StructWithList {
 	return StructWithList{
 		types.NewMap(
-			types.NewString("$type"), types.MakeTypeRef(__testPackageInFile_struct_with_list_CachedRef, 0),
 			types.NewString("l"), def.L.New(),
 			types.NewString("b"), types.Bool(def.B),
 			types.NewString("s"), types.NewString(def.S),
diff --git a/nomdl/codegen/test/struct_with_union_field.go b/nomdl/codegen/test/struct_with_union_field.go
index 449967fb63..dc5732b146 100644
--- a/nomdl/codegen/test/struct_with_union_field.go
+++ b/nomdl/codegen/test/struct_with_union_field.go
@@ -39,7 +39,6 @@ type StructWithUnionField struct {
 
 func NewStructWithUnionField() StructWithUnionField {
 	return StructWithUnionField{types.NewMap(
-		types.NewString("$type"), types.MakeTypeRef(__testPackageInFile_struct_with_union_field_CachedRef, 0),
 		types.NewString("a"), types.Float32(0),
 		types.NewString("$unionIndex"), types.UInt32(0),
 		types.NewString("$unionValue"), types.Float64(0),
@@ -55,7 +54,6 @@ type StructWithUnionFieldDef struct {
 func (def StructWithUnionFieldDef) New() StructWithUnionField {
 	return StructWithUnionField{
 		types.NewMap(
-			types.NewString("$type"), types.MakeTypeRef(__testPackageInFile_struct_with_union_field_CachedRef, 0),
 			types.NewString("a"), types.Float32(def.A),
 			types.NewString("$unionIndex"), types.UInt32(def.__unionIndex),
 			types.NewString("$unionValue"), def.__unionDefToValue(),
diff --git a/nomdl/codegen/test/struct_with_unions.go b/nomdl/codegen/test/struct_with_unions.go
index 0b5824fe24..04e26edb4f 100644
--- a/nomdl/codegen/test/struct_with_unions.go
+++ b/nomdl/codegen/test/struct_with_unions.go
@@ -48,7 +48,6 @@ type StructWithUnions struct {
 
 func NewStructWithUnions() StructWithUnions {
 	return StructWithUnions{types.NewMap(
-		types.NewString("$type"), types.MakeTypeRef(__testPackageInFile_struct_with_unions_CachedRef, 0),
 		types.NewString("a"), New__unionOfBOfFloat64AndCOfString(),
 		types.NewString("d"), New__unionOfEOfFloat64AndFOfString(),
 	), &ref.Ref{}}
@@ -62,7 +61,6 @@ type StructWithUnionsDef struct {
 func (def StructWithUnionsDef) New() StructWithUnions {
 	return StructWithUnions{
 		types.NewMap(
-			types.NewString("$type"), types.MakeTypeRef(__testPackageInFile_struct_with_unions_CachedRef, 0),
 			types.NewString("a"), def.A.New(),
 			types.NewString("d"), def.D.New(),
 		), &ref.Ref{}}
@@ -141,7 +139,6 @@ type __unionOfBOfFloat64AndCOfString struct {
 
 func New__unionOfBOfFloat64AndCOfString() __unionOfBOfFloat64AndCOfString {
 	return __unionOfBOfFloat64AndCOfString{types.NewMap(
-		types.NewString("$type"), types.MakeTypeRef(__testPackageInFile_struct_with_unions_CachedRef, 1),
 		types.NewString("$unionIndex"), types.UInt32(0),
 		types.NewString("$unionValue"), types.Float64(0),
 	), &ref.Ref{}}
@@ -155,7 +152,6 @@ type __unionOfBOfFloat64AndCOfStringDef struct {
 func (def __unionOfBOfFloat64AndCOfStringDef) New() __unionOfBOfFloat64AndCOfString {
 	return __unionOfBOfFloat64AndCOfString{
 		types.NewMap(
-			types.NewString("$type"), types.MakeTypeRef(__testPackageInFile_struct_with_unions_CachedRef, 1),
 			types.NewString("$unionIndex"), types.UInt32(def.__unionIndex),
 			types.NewString("$unionValue"), def.__unionDefToValue(),
 		), &ref.Ref{}}
@@ -286,7 +282,6 @@ type __unionOfEOfFloat64AndFOfString struct {
 
 func New__unionOfEOfFloat64AndFOfString() __unionOfEOfFloat64AndFOfString {
 	return __unionOfEOfFloat64AndFOfString{types.NewMap(
-		types.NewString("$type"), types.MakeTypeRef(__testPackageInFile_struct_with_unions_CachedRef, 2),
 		types.NewString("$unionIndex"), types.UInt32(0),
 		types.NewString("$unionValue"), types.Float64(0),
 	), &ref.Ref{}}
@@ -300,7 +295,6 @@ type __unionOfEOfFloat64AndFOfStringDef struct {
 func (def __unionOfEOfFloat64AndFOfStringDef) New() __unionOfEOfFloat64AndFOfString {
 	return __unionOfEOfFloat64AndFOfString{
 		types.NewMap(
-			types.NewString("$type"), types.MakeTypeRef(__testPackageInFile_struct_with_unions_CachedRef, 2),
 			types.NewString("$unionIndex"), types.UInt32(def.__unionIndex),
 			types.NewString("$unionValue"), def.__unionDefToValue(),
 		), &ref.Ref{}}
diff --git a/nomdl/codegen/testDeps/leafDep/leafDep.go b/nomdl/codegen/testDeps/leafDep/leafDep.go
index 66ea8d2320..bf40c4cf6f 100644
--- a/nomdl/codegen/testDeps/leafDep/leafDep.go
+++ b/nomdl/codegen/testDeps/leafDep/leafDep.go
@@ -35,7 +35,6 @@ type S struct {
 
 func NewS() S {
 	return S{types.NewMap(
-		types.NewString("$type"), types.MakeTypeRef(__testPackageInFile_leafDep_CachedRef, 0),
 		types.NewString("s"), types.NewString(""),
 		types.NewString("b"), types.Bool(false),
 	), &ref.Ref{}}
@@ -49,7 +48,6 @@ type SDef struct {
 func (def SDef) New() S {
 	return S{
 		types.NewMap(
-			types.NewString("$type"), types.MakeTypeRef(__testPackageInFile_leafDep_CachedRef, 0),
 			types.NewString("s"), types.NewString(def.S),
 			types.NewString("b"), types.Bool(def.B),
 		), &ref.Ref{}}