diff --git a/site/plugins/site/bootstrap.php b/site/plugins/site/bootstrap.php
index ce4582a9..1d4a2fb4 100644
--- a/site/plugins/site/bootstrap.php
+++ b/site/plugins/site/bootstrap.php
@@ -34,11 +34,6 @@ $site_loader = require_once $site_autoload;
  */
 include_once 'routes/web.php';
 
-/**
- * Include shortcodes
- */
-include_once 'shortcodes/SiteUrlShortcodeExtension.php';
-
 /**
  * Include dependencies
  */
diff --git a/site/plugins/site/composer.json b/site/plugins/site/composer.json
index 635f3bc8..76d26d47 100644
--- a/site/plugins/site/composer.json
+++ b/site/plugins/site/composer.json
@@ -29,8 +29,7 @@
     },
     "autoload": {
         "classmap": [
-            "app",
-            "twig"
+            "app"
         ]
     }
 }
diff --git a/site/plugins/site/dependencies.php b/site/plugins/site/dependencies.php
index d8ce7e6c..53c62761 100644
--- a/site/plugins/site/dependencies.php
+++ b/site/plugins/site/dependencies.php
@@ -17,6 +17,3 @@ namespace Flextype;
 $flextype['SiteController'] = static function ($container) {
     return new SiteController($container);
 };
-
-// Add Site Url Twig Extension
-$flextype->view->addExtension(new SiteUrlTwigExtension($flextype));
diff --git a/site/plugins/site/settings.yaml b/site/plugins/site/settings.yaml
index 2de5c257..885df8f5 100644
--- a/site/plugins/site/settings.yaml
+++ b/site/plugins/site/settings.yaml
@@ -20,6 +20,3 @@ robots: index, follow
 author:
   email: ''
   name: ''
-
-# Custom site site url
-site_url: ''