diff --git a/hugolib/menu_test.go b/hugolib/menu_test.go
index b829dd2ea..d4d425d50 100644
--- a/hugolib/menu_test.go
+++ b/hugolib/menu_test.go
@@ -487,7 +487,6 @@ func testSiteSetup(s *Site, t *testing.T) {
 
 	s.Menus = Menus{}
 	s.initializeSiteInfo()
-	s.Shortcodes = make(map[string]ShortcodeFunc)
 
 	if err := s.CreatePages(); err != nil {
 		t.Fatalf("Unable to create pages: %s", err)
diff --git a/hugolib/shortcode.go b/hugolib/shortcode.go
index c4eec974d..0d396a780 100644
--- a/hugolib/shortcode.go
+++ b/hugolib/shortcode.go
@@ -28,13 +28,6 @@ import (
 	jww "github.com/spf13/jwalterweatherman"
 )
 
-type ShortcodeFunc func([]string) string
-
-type Shortcode struct {
-	Name string
-	Func ShortcodeFunc
-}
-
 type ShortcodeWithPage struct {
 	Params interface{}
 	Inner  template.HTML
diff --git a/hugolib/site.go b/hugolib/site.go
index 4f3fd1a81..46c60a194 100644
--- a/hugolib/site.go
+++ b/hugolib/site.go
@@ -75,7 +75,6 @@ type Site struct {
 	Source         source.Input
 	Sections       Taxonomy
 	Info           SiteInfo
-	Shortcodes     map[string]ShortcodeFunc
 	Menus          Menus
 	timer          *nitro.B
 	Targets        targetList
@@ -450,7 +449,6 @@ func (s *Site) initialize() (err error) {
 
 	s.initializeSiteInfo()
 
-	s.Shortcodes = make(map[string]ShortcodeFunc)
 	return
 }