From 8e986c42b1d1b8100abb406a61a25ec34caada9a Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 3 Oct 2015 07:31:01 +1000
Subject: [PATCH] Remove some deprecated code

---
 modules/system/partials/_settings_menu.htm |  8 +-------
 tests/unit/cms/classes/ControllerTest.php  | 11 -----------
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/modules/system/partials/_settings_menu.htm b/modules/system/partials/_settings_menu.htm
index 0fa6a1367..67a25b2e0 100644
--- a/modules/system/partials/_settings_menu.htm
+++ b/modules/system/partials/_settings_menu.htm
@@ -1,10 +1,4 @@
 <?php
     $systemItems = System\Classes\SettingsManager::instance()->listItems('system');
-
-    // @todo Trialing the removal of this due to the new account menu
-    // @deprecated Remove if year >= 2016
-    $mySettingItems = []; //System\Classes\SettingsManager::instance()->listItems('mysettings');
 ?>
-<?php /* @deprecated Remove if year >= 2016 */ ?>
-<?= $this->makePartial('~/modules/system/partials/_settings_menu_items.htm', ['items' => $mySettingItems]); ?>
-<?= $this->makePartial('~/modules/system/partials/_settings_menu_items.htm', ['items' => $systemItems]); ?>
\ No newline at end of file
+<?= $this->makePartial('~/modules/system/partials/_settings_menu_items.htm', ['items' => $systemItems]); ?>
diff --git a/tests/unit/cms/classes/ControllerTest.php b/tests/unit/cms/classes/ControllerTest.php
index e15220c1d..0c60429e8 100644
--- a/tests/unit/cms/classes/ControllerTest.php
+++ b/tests/unit/cms/classes/ControllerTest.php
@@ -189,17 +189,6 @@ class ControllerTest extends TestCase
         $theme = Theme::load('test');
         $controller = new Controller($theme);
         $controller->run('/ajax-test');
-
-        //
-        // This was the old approach, can remove this comment block if year >= 2017
-        //
-
-        // $response = $controller->run('/ajax-test');
-        // $this->assertInstanceOf('Symfony\Component\HttpFoundation\Response', $response);
-
-        // $this->assertInternalType('string', $response->getOriginalContent());
-        // $this->assertEquals(500, $response->getStatusCode());
-        // $this->assertEquals("AJAX handler 'onNoHandler' was not found.", $response->getOriginalContent());
     }
 
     /**