diff --git a/claat/cmd/export_test.go b/claat/cmd/export_test.go
index 1bc614491..03fd3e076 100644
--- a/claat/cmd/export_test.go
+++ b/claat/cmd/export_test.go
@@ -63,7 +63,7 @@ func TestExportCodelabMemory(t *testing.T) {
 			opts := cmd.CmdExportOptions{
 				Expenv:   "web",
 				Output:   tmp,
-				Tmplout:  "devsite",
+				Tmplout:  "html",
 				GlobalGA: "UA-99999999-99",
 			}
 
diff --git a/claat/render/html.go b/claat/render/html.go
index 57f0039cc..447c2eb4a 100644
--- a/claat/render/html.go
+++ b/claat/render/html.go
@@ -229,13 +229,7 @@ func (hw *htmlWriter) code(n *nodes.CodeNode) {
 		}
 		hw.writeString(">")
 	}
-	if hw.format == "devsite" {
-		hw.writeString("{% verbatim %}")
-	}
 	hw.writeEscape(n.Value)
-	if hw.format == "devsite" {
-		hw.writeString("{% endverbatim %}")
-	}
 	if !n.Term {
 		hw.writeString("</code>")
 	}
@@ -308,11 +302,7 @@ func (hw *htmlWriter) itemsList(n *nodes.ItemsListNode) {
 }
 
 func (hw *htmlWriter) grid(n *nodes.GridNode) {
-	if hw.format == "devsite" {
-		hw.writeString("<table class=\"vertical-rules\">\n")
-	} else {
-		hw.writeString("<table>\n")
-	}
+	hw.writeString("<table>\n")
 	for _, r := range n.Rows {
 		hw.writeString("<tr>")
 		for _, c := range r {
diff --git a/claat/render/html_test.go b/claat/render/html_test.go
index 58b0f0ac3..365f578aa 100644
--- a/claat/render/html_test.go
+++ b/claat/render/html_test.go
@@ -676,10 +676,9 @@ bar</paper-button>`,
 
 func TestCode(t *testing.T) {
 	tests := []struct {
-		name     string
-		inNode   *nodes.CodeNode
-		inFormat string
-		out      string
+		name   string
+		inNode *nodes.CodeNode
+		out    string
 	}{
 		{
 			name:   "NoLang",
@@ -691,23 +690,11 @@ func TestCode(t *testing.T) {
 			inNode: nodes.NewCodeNode("foobar", false, "c"),
 			out:    `<pre><code language="c" class="c">foobar</code></pre>`,
 		},
-		{
-			name:     "NoLangDevsite",
-			inNode:   nodes.NewCodeNode("foobar", false, ""),
-			inFormat: "devsite",
-			out:      `<pre><code>{% verbatim %}foobar{% endverbatim %}</code></pre>`,
-		},
-		{
-			name:     "LangDevsite",
-			inNode:   nodes.NewCodeNode("foobar", false, "c"),
-			inFormat: "devsite",
-			out:      `<pre><code language="c" class="c">{% verbatim %}foobar{% endverbatim %}</code></pre>`,
-		},
 	}
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {
 			outBuffer := &bytes.Buffer{}
-			hw := &htmlWriter{w: outBuffer, format: tc.inFormat}
+			hw := &htmlWriter{w: outBuffer}
 			hw.code(tc.inNode)
 			out := outBuffer.String()
 			if diff := cmp.Diff(tc.out, out); diff != "" {
@@ -873,7 +860,69 @@ func TestOnlyImages(t *testing.T) {
 }
 
 // TODO: test itemsList
-// TODO: test grid
+
+func TestGrid(t *testing.T) {
+	tests := []struct {
+		name   string
+		inNode *nodes.GridNode
+		out    string
+	}{
+		{
+			name:   "No rows or cells ",
+			inNode: nodes.NewGridNode(),
+			out:    "<table>\n</table>",
+		},
+		{
+			name: "One row and no cells",
+			inNode: nodes.NewGridNode([][]*nodes.GridCell{
+				[]*nodes.GridCell{},
+			}...),
+			out: "<table>\n<tr></tr>\n</table>",
+		},
+		{
+			name: "One row and one cell",
+			inNode: nodes.NewGridNode([][]*nodes.GridCell{
+				[]*nodes.GridCell{
+					&nodes.GridCell{
+						Content: nodes.NewListNode([]nodes.Node{
+							nodes.NewTextNode(nodes.NewTextNodeOptions{Value: "foo"}),
+						}...),
+					},
+				},
+			}...),
+			out: "<table>\n<tr><td colspan=\"0\" rowspan=\"0\">foo</td></tr>\n</table>",
+		},
+		{
+			name: "One row and multiple cells",
+			inNode: nodes.NewGridNode([][]*nodes.GridCell{
+				[]*nodes.GridCell{
+					&nodes.GridCell{
+						Content: nodes.NewListNode([]nodes.Node{
+							nodes.NewTextNode(nodes.NewTextNodeOptions{Value: "foo"}),
+						}...),
+					},
+					&nodes.GridCell{
+						Content: nodes.NewListNode([]nodes.Node{
+							nodes.NewTextNode(nodes.NewTextNodeOptions{Value: "bar"}),
+						}...),
+					},
+				},
+			}...),
+			out: "<table>\n<tr><td colspan=\"0\" rowspan=\"0\">foo</td><td colspan=\"0\" rowspan=\"0\">bar</td></tr>\n</table>",
+		},
+	}
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			outBuffer := &bytes.Buffer{}
+			hw := &htmlWriter{w: outBuffer}
+			hw.grid(tc.inNode)
+			out := outBuffer.String()
+			if diff := cmp.Diff(tc.out, out); diff != "" {
+				t.Errorf("hw.grid(%+v) got diff (-want +got):\n%s", tc.inNode, diff)
+			}
+		})
+	}
+}
 
 func TestInfobox(t *testing.T) {
 	tests := []struct {
diff --git a/claat/render/template-devsite.html b/claat/render/template-devsite.html
deleted file mode 100644
index 18d2be08c..000000000
--- a/claat/render/template-devsite.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!--
-Copyright (c) 2019 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not
-use this file except in compliance with the License. You may obtain a copy of
-the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-License for the specific language governing permissions and limitations under
-the License.
--->
-<html devsite>
-  <head>
-    <title>{{.Meta.Title}}</title>
-    {{if .Meta.Extra.project -}}
-      <meta name="project_path" value="{{.Meta.Extra.project}}">
-    {{end -}}
-    {{if .Meta.Extra.book -}}
-      <meta name="book_path" value="{{.Meta.Extra.book}}">
-    {{end -}}
-    <meta name="keywords" value="{{range $index, $tag := .Meta.Tags}}{{if $index}},{{end}}tag_{{$tag}}{{end}}{{range $index, $cat := .Meta.Categories}},category_{{$cat}}{{end}}" />
-    {{if .Meta.Summary -}}
-      <meta name="description" content="{{.Meta.Summary}}" />
-    {{- end}}
-    {{if .Meta.Source -}}
-      <meta name="original_source" content="https://docs.google.com/document/d/{{.Meta.Source}}/edit" />
-    {{end -}}
-    <meta name="hide_last_updated" value="true" />
-    <meta name="hide_ratings_widget" value="true" />
-    <meta name="page_type" value="codelab" />
-    <meta name="duration_minutes" value="{{.Meta.Duration}}" />
-    {{if .Meta.Authors -}}
-      <meta name="author_name" value="{{.Meta.Authors}}" />
-    {{end -}}
-    {{if .Meta.Extra.robots -}}
-      <meta name="robots" value="{{.Meta.Extra.robots}}">
-    {{end -}}
-    <style>
-      body {
-        transition: opacity ease-in 0.2s;
-      }
-
-      body[unresolved] {
-        opacity: 0;
-        display: block;
-        overflow: hidden;
-        position: relative;
-      }
-    </style>
-  </head>
-  <body>
-    <google-codelab-analytics gaid="{{.GlobalGA}}"></google-codelab-analytics>
-    <google-codelab codelab-gaid="{{.Meta.GA}}"
-                    doc-id="{{.Meta.Source}}"
-                    id="{{.Meta.ID}}"
-                    title="{{.Meta.Title}}"
-                    environment="{{index .Env}}"
-                    category="{{range  $index, $cat := .Meta.Categories}}{{if $index}},{{end}}{{$cat}}{{end}}"
-                    feedback-link="{{.Meta.Feedback}}"
-                    {{if .Meta.Extra.badge}}badge-path="{{.Meta.Extra.badge}}"{{end}}>
-      {{range $i, $e := .Steps}}{{if matchEnv .Tags $.Env}}
-        <google-codelab-step label="{{.Title}}" duration="{{.Duration.Minutes}}" step="{{$i}}">
-          {{if eq $i 0}}
-            <google-codelab-about codelab-title="{{$.Meta.Title}}"
-                                  {{if $.Meta.Authors}}authors="{{$.Meta.Authors}}"{{end}}
-                                  {{if $.Updated}}last-updated="{{$.Updated}}"{{end}}
-                                  {{if $.Meta.Duration}}duration="{{$.Meta.Duration}}"{{end}}>
-            </google-codelab-about>
-          {{end}}
-          <h2 class="step-title" id="{{$i}}" data-text="{{.Title}}">
-              {{inc $i}}. {{.Title}}
-          </h2>
-          {{.Content | renderHTML $.Context}}
-        </google-codelab-step>
-      {{end}}{{end}}
-    </google-codelab>
-  </body>
-</html>
diff --git a/claat/render/template.go b/claat/render/template.go
index 8b1c1daba..ad73cbc78 100644
--- a/claat/render/template.go
+++ b/claat/render/template.go
@@ -152,9 +152,6 @@ type template struct {
 //go:embed template.html
 var newHTMLTemplate []byte
 
-//go:embed template-devsite.html
-var newHTMLDevsiteTemplate []byte
-
 //go:embed template.md
 var newMDTemplate []byte
 
@@ -174,11 +171,6 @@ func parseTemplate(name string, fmap map[string]interface{}) (executer, error) {
 			bytes: newHTMLTemplate,
 			html:  true,
 		}
-	case "devsite":
-		tmpl = &template{
-			bytes: newHTMLDevsiteTemplate,
-			html:  true,
-		}
 	case "md":
 		tmpl = &template{
 			bytes: newMDTemplate,