diff --git a/app/_config/base-site-config.yml b/app/_config/base-site-config.yml
index 5727b6b..6fe7944 100644
--- a/app/_config/base-site-config.yml
+++ b/app/_config/base-site-config.yml
@@ -10,6 +10,7 @@ SilverStripe\SiteConfig\SiteConfig:
 
 SilverStripe\CMS\Model\SiteTree:
   extensions:
+    - Dynamic\Base\Extension\CmsDesignDataExtension
     - Dynamic\Base\Extension\SeoExtension
 
 Dynamic\Base\Page\HomePage:
@@ -36,11 +37,6 @@ SilverStripe\Blog\Model\BlogPost:
     - Dynamic\SiteTools\Extension\PreviewExtension
   elemental_keep_content_field: true
 
-Dynamic\Base\Model\CompanyAddress:
-  extensions:
-    - Dynamic\SilverStripeGeocoder\AddressDataExtension
-    - Dynamic\SiteTools\Extension\ContactDataExtension
-
 SilverStripe\UserForms\Model\EditableFormField:
   extensions:
     - Dynamic\SiteTools\Extension\DataobjectPermissionExtension