diff --git a/_config/users.yml b/_config/users.yml
index d248dad..af87f7b 100644
--- a/_config/users.yml
+++ b/_config/users.yml
@@ -1,10 +1,10 @@
 ---
 Name: ordersusers
 Only:
-  moduleexists: 'i-lateral/silverstripe-users'
+  moduleexists: 'dft/silverstripe-users'
 After: '#usersconfig'
 ---
 # Setup default registration config for users module
-ilateral\SilverStripe\Users\Control\AccountController:
+DFT\SilverStripe\Users\Control\AccountController:
   extensions:
     - SilverCommerce\OrdersAdmin\Extensions\AccountControllerExtension
\ No newline at end of file
diff --git a/src/Search/OrderSearchContext.php b/src/Search/OrderSearchContext.php
index adc1f28..0acc9cc 100644
--- a/src/Search/OrderSearchContext.php
+++ b/src/Search/OrderSearchContext.php
@@ -5,7 +5,7 @@
 use DateTime;
 use SilverStripe\Forms\DateField;
 use SilverStripe\Versioned\Versioned;
-use ilateral\SilverStripe\ModelAdminPlus\SearchContext;
+use DFT\SilverStripe\ModelAdminPlus\SearchContext;
 
 class OrderSearchContext extends SearchContext
 {
diff --git a/src/admin/OrderAdmin.php b/src/admin/OrderAdmin.php
index 3c80b4e..9592e22 100644
--- a/src/admin/OrderAdmin.php
+++ b/src/admin/OrderAdmin.php
@@ -6,13 +6,10 @@
 use SilverStripe\ORM\DB;
 use SilverStripe\Forms\DateField;
 use Colymba\BulkManager\BulkManager;
-use SilverStripe\Core\Config\Config;
 use SilverCommerce\OrdersAdmin\Model\Invoice;
 use SilverCommerce\OrdersAdmin\Model\Estimate;
-use Colymba\BulkManager\BulkAction\EditHandler;
-use Colymba\BulkManager\BulkAction\UnlinkHandler;
 use SilverStripe\Forms\GridField\GridFieldDetailForm;
-use ilateral\SilverStripe\ModelAdminPlus\ModelAdminPlus;
+use DFT\SilverStripe\ModelAdminPlus\ModelAdminPlus;
 use SilverStripe\Forms\GridField\GridFieldSortableHeader;
 use SilverCommerce\CatalogueAdmin\BulkManager\PaidHandler;
 use SilverCommerce\CatalogueAdmin\BulkManager\CancelHandler;
diff --git a/src/bulkmanager/CancelHandler.php b/src/bulkmanager/CancelHandler.php
index 5a3d1af..666b43b 100644
--- a/src/bulkmanager/CancelHandler.php
+++ b/src/bulkmanager/CancelHandler.php
@@ -7,12 +7,6 @@
 use SilverStripe\Core\Convert;
 use Colymba\BulkManager\BulkAction\Handler as GridFieldBulkActionHandler;
 
-/**
- * A {@link GridFieldBulkActionHandler} for bulk cancelling records
- *
- * @author i-lateral (http://www.i-lateral.com)
- * @package orders-admin
- */
 class CancelHandler extends GridFieldBulkActionHandler
 {
     private static $url_segment = 'cancel';
diff --git a/src/bulkmanager/CollectedHandler.php b/src/bulkmanager/CollectedHandler.php
index 2825133..8a02808 100644
--- a/src/bulkmanager/CollectedHandler.php
+++ b/src/bulkmanager/CollectedHandler.php
@@ -7,12 +7,6 @@
 use SilverStripe\Core\Convert;
 use Colymba\BulkManager\BulkAction\Handler as GridFieldBulkActionHandler;
 
-/**
- * A {@link GridFieldBulkActionHandler} for bulk cancelling records
- *
- * @author i-lateral (http://www.i-lateral.com)
- * @package orders-admin
- */
 class CollectedHandler extends GridFieldBulkActionHandler
 {
     private static $url_segment = 'collected';
diff --git a/src/bulkmanager/DispatchedHandler.php b/src/bulkmanager/DispatchedHandler.php
index 55330ec..1ce30d7 100644
--- a/src/bulkmanager/DispatchedHandler.php
+++ b/src/bulkmanager/DispatchedHandler.php
@@ -7,12 +7,6 @@
 use SilverStripe\Core\Convert;
 use Colymba\BulkManager\BulkAction\Handler as GridFieldBulkActionHandler;
 
-/**
- * A {@link GridFieldBulkActionHandler} for bulk cancelling records
- *
- * @author i-lateral (http://www.i-lateral.com)
- * @package orders-admin
- */
 class DispatchedHandler extends GridFieldBulkActionHandler
 {
     private static $url_segment = 'dispatched';
diff --git a/src/bulkmanager/PaidHandler.php b/src/bulkmanager/PaidHandler.php
index 241d50d..f16a7b1 100644
--- a/src/bulkmanager/PaidHandler.php
+++ b/src/bulkmanager/PaidHandler.php
@@ -7,12 +7,6 @@
 use SilverStripe\Core\Convert;
 use Colymba\BulkManager\BulkAction\Handler as GridFieldBulkActionHandler;
 
-/**
- * A {@link GridFieldBulkActionHandler} for bulk cancelling records
- *
- * @author i-lateral (http://www.i-lateral.com)
- * @package orders-admin
- */
 class PaidHandler extends GridFieldBulkActionHandler
 {
     private static $url_segment = 'paid';
diff --git a/src/bulkmanager/PartPaidHandler.php b/src/bulkmanager/PartPaidHandler.php
index 59cd1aa..b483df2 100644
--- a/src/bulkmanager/PartPaidHandler.php
+++ b/src/bulkmanager/PartPaidHandler.php
@@ -7,12 +7,6 @@
 use SilverStripe\Core\Convert;
 use Colymba\BulkManager\BulkAction\Handler as GridFieldBulkActionHandler;
 
-/**
- * A {@link GridFieldBulkActionHandler} for bulk cancelling records
- *
- * @author i-lateral (http://www.i-lateral.com)
- * @package orders-admin
- */
 class PartPaidHandler extends GridFieldBulkActionHandler
 {
     private static $url_segment = 'partpaid';
diff --git a/src/bulkmanager/PendingHandler.php b/src/bulkmanager/PendingHandler.php
index ebac663..13623a1 100644
--- a/src/bulkmanager/PendingHandler.php
+++ b/src/bulkmanager/PendingHandler.php
@@ -7,12 +7,6 @@
 use SilverStripe\Core\Convert;
 use Colymba\BulkManager\BulkAction\Handler as GridFieldBulkActionHandler;
 
-/**
- * A {@link GridFieldBulkActionHandler} for bulk cancelling records
- *
- * @author i-lateral (http://www.i-lateral.com)
- * @package orders-admin
- */
 class PendingHandler extends GridFieldBulkActionHandler
 {
     private static $url_segment = 'pending';
diff --git a/src/bulkmanager/ProcessingHandler.php b/src/bulkmanager/ProcessingHandler.php
index 637a12e..120a440 100644
--- a/src/bulkmanager/ProcessingHandler.php
+++ b/src/bulkmanager/ProcessingHandler.php
@@ -7,12 +7,6 @@
 use SilverStripe\Core\Convert;
 use Colymba\BulkManager\BulkAction\Handler as GridFieldBulkActionHandler;
 
-/**
- * A {@link GridFieldBulkActionHandler} for bulk cancelling records
- *
- * @author i-lateral (http://www.i-lateral.com)
- * @package orders-admin
- */
 class ProcessingHandler extends GridFieldBulkActionHandler
 {
     private static $url_segment = 'processing';
diff --git a/src/bulkmanager/RefundHandler.php b/src/bulkmanager/RefundHandler.php
index ca906b1..2455cd2 100644
--- a/src/bulkmanager/RefundHandler.php
+++ b/src/bulkmanager/RefundHandler.php
@@ -7,12 +7,6 @@
 use SilverStripe\Core\Convert;
 use Colymba\BulkManager\BulkAction\Handler as GridFieldBulkActionHandler;
 
-/**
- * A {@link GridFieldBulkActionHandler} for bulk cancelling records
- *
- * @author i-lateral (http://www.i-lateral.com)
- * @package orders-admin
- */
 class RefundHandler extends GridFieldBulkActionHandler
 {
     private static $url_segment = 'refund';
diff --git a/src/extensions/AccountControllerExtension.php b/src/extensions/AccountControllerExtension.php
index 4a77e7e..9a89ad4 100644
--- a/src/extensions/AccountControllerExtension.php
+++ b/src/extensions/AccountControllerExtension.php
@@ -2,31 +2,16 @@
 
 namespace SilverCommerce\OrdersAdmin\Extensions;
 
-use SilverStripe\i18n\i18n;
-use SilverStripe\Forms\Form;
 use SilverStripe\Core\Extension;
 use SilverStripe\View\ArrayData;
-use SilverStripe\Forms\TextField;
-use SilverStripe\Forms\FieldList;
-use SilverStripe\Forms\FormAction;
 use SilverStripe\ORM\PaginatedList;
-use SilverStripe\Forms\HeaderField;
-use SilverStripe\Forms\HiddenField;
 use SilverStripe\Security\Security;
-use SilverStripe\Forms\LiteralField;
-use SilverStripe\Forms\CheckboxField;
-use SilverStripe\Forms\DropdownField;
-use SilverStripe\Forms\CompositeField;
-use SilverStripe\Forms\RequiredFields;
-use SilverStripe\ORM\ValidationResult;
-use SilverCommerce\ContactAdmin\Model\ContactLocation;
-use ilateral\SilverStripe\Users\Control\AccountController;
+use DFT\SilverStripe\Users\Control\AccountController;
 
 /**
  * Add extra fields to a user account (if the users module is
  * installed) to allow logged in users to see their invoices.
  *
- * @package orders
  */
 class AccountControllerExtension extends Extension
 {
diff --git a/src/forms/gridfield/AddLineItem.php b/src/forms/gridfield/AddLineItem.php
index e876111..37625c0 100644
--- a/src/forms/gridfield/AddLineItem.php
+++ b/src/forms/gridfield/AddLineItem.php
@@ -27,12 +27,7 @@
  * A specific gridfield field designed to allow the creation of a new
  * order item and that auto completes all fields from a pre-defined
  * object (default Product).
- *
- * @package orders-admin
- *
- * @author ilateral <info@ilateral.co.uk>
- * @author Michael Strong <github@michaelstrong.co.uk>
-**/
+ **/
 class AddLineItem extends GridFieldAddExistingAutocompleter
 {
 
diff --git a/src/forms/gridfield/OrdersDetailForm.php b/src/forms/gridfield/OrdersDetailForm.php
index b5d346e..493fe06 100644
--- a/src/forms/gridfield/OrdersDetailForm.php
+++ b/src/forms/gridfield/OrdersDetailForm.php
@@ -9,8 +9,6 @@
  * with editing Order and Estimate objects specificaly and isn't really
  * intended to be more flexible in terms of support (though this might
  * be added later).
- *
- * @author ilateral
  */
 class OrdersDetailForm extends GridFieldDetailForm
 {
diff --git a/src/model/LineItem.php b/src/model/LineItem.php
index 7e10cb2..8accb69 100644
--- a/src/model/LineItem.php
+++ b/src/model/LineItem.php
@@ -46,8 +46,6 @@
  * @method TaxRate Tax
  * @method TaxRate TaxRate
  * @method \SilverStripe\ORM\HasManyList Customisations
- *
- * @author Mo <morven@ilateral.co.uk>
  */
 class LineItem extends DataObject implements TaxableProvider
 {