diff --git a/collections.go b/collections.go
index da803e1..ea5b929 100644
--- a/collections.go
+++ b/collections.go
@@ -70,7 +70,6 @@ type (
 		Privacy   int    `schema:"privacy" json:"privacy"`
 		Pass      string `schema:"password" json:"password"`
 		MathJax   bool   `schema:"mathjax" json:"mathjax"`
-		Highlight bool   `schema:"highlight" json:"highlight"`
 		Handle    string `schema:"handle" json:"handle"`
 
 		// Actual collection values updated in the DB
@@ -307,10 +306,6 @@ func (c *Collection) RenderMathJax() bool {
 	return c.db.CollectionHasAttribute(c.ID, "render_mathjax")
 }
 
-func (c *Collection) CodeHighlight() bool {
-	return c.db.CollectionHasAttribute(c.ID, "code_highlight")
-}
-
 func newCollection(app *app, w http.ResponseWriter, r *http.Request) error {
 	reqJSON := IsJSON(r.Header.Get("Content-Type"))
 	alias := r.FormValue("alias")
diff --git a/database.go b/database.go
index e9f052e..0c79e10 100644
--- a/database.go
+++ b/database.go
@@ -800,21 +800,6 @@ func (db *datastore) UpdateCollection(c *SubmittedCollection, alias string) erro
 		}
 	}
 
-	// Update CodeHighlight value
-	if c.Highlight {
-		_, err = db.Exec("INSERT INTO collectionattributes (collection_id, attribute, value) VALUES (?, ?, ?) ON DUPLICATE KEY UPDATE value = ?", collID, "code_highlight", "1", "1")
-		if err != nil {
-			log.Error("Unable to insert code_highlight value: %v", err)
-			return err
-		}
-	} else {
-		_, err = db.Exec("DELETE FROM collectionattributes WHERE collection_id = ? AND attribute = ?", collID, "code_highlight")
-		if err != nil {
-			log.Error("Unable to delete code_highlight value: %v", err)
-			return err
-		}
-	}
-
 	// Update rest of the collection data
 	res, err = db.Exec("UPDATE collections SET "+q.Updates+" WHERE "+q.Conditions, q.Params...)
 	if err != nil {
diff --git a/templates/user/collection.tmpl b/templates/user/collection.tmpl
index 703755b..21a05a9 100644
--- a/templates/user/collection.tmpl
+++ b/templates/user/collection.tmpl
@@ -105,11 +105,6 @@
 						MathJax
 					</label>
 				</li>
-				<li>
-				  <label><input type="checkbox" name="highlight" {{if .CodeHighlight}}checked="checked"{{end}} />
-				  Syntax highlight source-code
-				  </label>
-				</li>
 			</ul>
 		</div>
 	</div>