diff --git a/code/Controllers/CMSMain.php b/code/Controllers/CMSMain.php
index 667fb726..7feb03a8 100644
--- a/code/Controllers/CMSMain.php
+++ b/code/Controllers/CMSMain.php
@@ -12,6 +12,7 @@ use SilverStripe\CMS\Model\SiteTree;
 use SilverStripe\Control\Controller;
 use SilverStripe\Control\Director;
 use SilverStripe\Control\Session;
+use SilverStripe\Control\SS_HTTPRequest;
 use SilverStripe\Control\SS_HTTPResponse;
 use SilverStripe\Control\SS_HTTPResponse_Exception;
 use SilverStripe\Core\Convert;
@@ -23,6 +24,7 @@ use SilverStripe\Forms\FieldGroup;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\Form;
 use SilverStripe\Forms\FormAction;
+use SilverStripe\Forms\FormField;
 use SilverStripe\Forms\GridField\GridField;
 use SilverStripe\Forms\GridField\GridFieldConfig;
 use SilverStripe\Forms\GridField\GridFieldDataColumns;
@@ -34,12 +36,12 @@ use SilverStripe\Forms\LabelField;
 use SilverStripe\Forms\LiteralField;
 use SilverStripe\Forms\RequiredFields;
 use SilverStripe\Forms\ResetFormAction;
+use SilverStripe\Forms\TabSet;
 use SilverStripe\Forms\TextField;
 use SilverStripe\ORM\ArrayList;
 use SilverStripe\ORM\DataList;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\DB;
-use SilverStripe\ORM\FieldType\DBHTMLText;
 use SilverStripe\ORM\HiddenClass;
 use SilverStripe\ORM\SS_List;
 use SilverStripe\ORM\Versioning\Versioned;
diff --git a/code/Controllers/OldPageRedirector.php b/code/Controllers/OldPageRedirector.php
index bb5bbd9d..b5b0a682 100644
--- a/code/Controllers/OldPageRedirector.php
+++ b/code/Controllers/OldPageRedirector.php
@@ -9,7 +9,6 @@ use SilverStripe\Control\SS_HTTPRequest;
 use SilverStripe\Control\SS_HTTPResponse;
 use SilverStripe\Control\SS_HTTPResponse_Exception;
 use SilverStripe\Core\Extension;
-use SilverStripe\ORM\Queries\SQLSelect;
 
 class OldPageRedirector extends Extension {
 
diff --git a/code/Controllers/SilverStripeNavigatorItem.php b/code/Controllers/SilverStripeNavigatorItem.php
index 4c248bb6..a31c366a 100644
--- a/code/Controllers/SilverStripeNavigatorItem.php
+++ b/code/Controllers/SilverStripeNavigatorItem.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace SilverStripe\CMS\Controllers;
 
 use SilverStripe\Admin\CMSPreviewable;
diff --git a/code/Controllers/SilverStripeNavigatorItem_ArchiveLink.php b/code/Controllers/SilverStripeNavigatorItem_ArchiveLink.php
index dd3161f1..a4dc3ca2 100644
--- a/code/Controllers/SilverStripeNavigatorItem_ArchiveLink.php
+++ b/code/Controllers/SilverStripeNavigatorItem_ArchiveLink.php
@@ -1,8 +1,9 @@
 <?php
 namespace SilverStripe\CMS\Controllers;
 
-use Controller;
 use SilverStripe\CMS\Model\RedirectorPage;
+use SilverStripe\Control\Controller;
+use SilverStripe\Core\Convert;
 use SilverStripe\ORM\FieldType\DBDatetime;
 use SilverStripe\ORM\FieldType\DBField;
 use SilverStripe\ORM\Versioning\Versioned;
@@ -34,7 +35,7 @@ class SilverStripeNavigatorItem_ArchiveLink extends SilverStripeNavigatorItem
         if (empty($date)) {
             return null;
         }
-        /** @var SS_Datetime $dateObj */
+        /** @var DBDatetime $dateObj */
         $dateObj = DBField::create_field('Datetime', $date);
         $title = _t('ContentControl.NOTEWONTBESHOWN', 'Note: this message will not be shown to your visitors');
         return "<div id=\"SilverStripeNavigatorMessage\" title=\"{$title}\">"
diff --git a/code/Controllers/SilverStripeNavigatorItem_CMSLink.php b/code/Controllers/SilverStripeNavigatorItem_CMSLink.php
index 73798eca..c95e42f5 100644
--- a/code/Controllers/SilverStripeNavigatorItem_CMSLink.php
+++ b/code/Controllers/SilverStripeNavigatorItem_CMSLink.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace SilverStripe\CMS\Controllers;
 
 use SilverStripe\Admin\LeftAndMain;
diff --git a/code/Controllers/SilverStripeNavigatorItem_LiveLink.php b/code/Controllers/SilverStripeNavigatorItem_LiveLink.php
index 34d96b05..9a762922 100644
--- a/code/Controllers/SilverStripeNavigatorItem_LiveLink.php
+++ b/code/Controllers/SilverStripeNavigatorItem_LiveLink.php
@@ -3,6 +3,7 @@ namespace SilverStripe\CMS\Controllers;
 
 use SilverStripe\CMS\Model\RedirectorPage;
 use SilverStripe\Control\Controller;
+use SilverStripe\Core\Convert;
 use SilverStripe\ORM\Versioning\Versioned;
 
 class SilverStripeNavigatorItem_LiveLink extends SilverStripeNavigatorItem
diff --git a/code/Controllers/SilverStripeNavigatorItem_StageLink.php b/code/Controllers/SilverStripeNavigatorItem_StageLink.php
index f4c67d71..47536daf 100644
--- a/code/Controllers/SilverStripeNavigatorItem_StageLink.php
+++ b/code/Controllers/SilverStripeNavigatorItem_StageLink.php
@@ -4,6 +4,7 @@ namespace SilverStripe\CMS\Controllers;
 use SilverStripe\CMS\Model\RedirectorPage;
 use SilverStripe\Control\Controller;
 use SilverStripe\Core\ClassInfo;
+use SilverStripe\Core\Convert;
 use SilverStripe\ORM\Versioning\Versioned;
 use SiteTreeFutureState;