diff --git a/src/Form/BreakpointFormTrait.php b/src/Form/BreakpointFormTrait.php
index 631da76..4b0bbfc 100644
--- a/src/Form/BreakpointFormTrait.php
+++ b/src/Form/BreakpointFormTrait.php
@@ -22,22 +22,14 @@ trait BreakpointFormTrait {
       $form_state->setError($element['browser_size'], t('The browser size cannot be empty if ad size(s) exists.'));
     }
     elseif (!empty($element['browser_size']['#value']) && empty($element['ad_sizes']['#value'])) {
-      $form_state->setError($element['ad_sizes'], t(
-          'The ad size(s) cannot be empty if a browser size exists. If you wish to suppress an ad slot for a given browser size, you can enter "@none" in the ad size(s) field.',
-          array('@none' => '<none>')
-        )
-      );
+      $form_state->setError($element['ad_sizes'], t('The ad size(s) cannot be empty if a browser size exists.'));
     }
     if (!empty($element['browser_size']['#value']) && !empty($element['ad_sizes']['#value'])) {
       if (preg_match('/[^x|0-9]/', $element['browser_size']['#value'])) {
         $form_state->setError($element['browser_size'], t('The browser size can only contain numbers and the character x.'));
       }
-      elseif ($element['ad_sizes']['#value'] != '<none>' && preg_match('/[^x|,|0-9]/', $element['ad_sizes']['#value'])) {
-        $form_state->setError($element['ad_sizes'], t(
-            'The ad size(s) string can only contain numbers, the character x and commas (unless it is the special keyword "@none").',
-            array('@none' => '<none>')
-          )
-        );
+      elseif (preg_match('/[^x|,|0-9]/', $element['ad_sizes']['#value'])) {
+        $form_state->setError($element['ad_sizes'], t('The ad size(s) can only contain numbers, the character x and commas.'));
       }
     }
   }
@@ -166,10 +158,7 @@ trait BreakpointFormTrait {
     ];
     if (empty($data)) {
       $form['breakpoints']['table'][$key]['browser_size']['#description'] = $this->t('Example: 1024x768');
-      $form['breakpoints']['table'][$key]['ad_sizes']['#description'] = $this->t(
-        'Example: 300x600, 300x250. Enter "@none" to suppress this slot for a given browser size.',
-        array('@none' => '<none>')
-      );
+      $form['breakpoints']['table'][$key]['ad_sizes']['#description'] = $this->t('Example: 300x600,300x250');
     }
   }
 
diff --git a/src/Tests/DisplayTagTest.php b/src/Tests/DisplayTagTest.php
index 9d4ff33..261359f 100644
--- a/src/Tests/DisplayTagTest.php
+++ b/src/Tests/DisplayTagTest.php
@@ -69,14 +69,7 @@ class DisplayTagTest extends DfpTestBase {
     $edit['breakpoints[0][browser_size]'] = $this->dfpGenerateSize();
     $edit['breakpoints[0][ad_sizes]'] = '100y100,200x200';
     $this->dfpEditTag($tag->id(), $edit);
-    $this->assertText(t('The ad size(s) string can only contain numbers, the character x and commas (unless it is the special keyword "&lt;none&gt;").'), 'An error was correctly thrown when invalid characters.');
-
-    // Test tags with ad_size set to <none>.
-    $edit['breakpoints[0][browser_size]'] = '0x0';
-    $edit['breakpoints[0][ad_sizes]'] = '<none>';
-    $this->dfpEditTag($tag->id(), $edit);
-    $this->drupalGet('');
-    $this->assertRaw('addSize([0, 0], [])');
+    $this->assertText(t('The ad size(s) can only contain numbers, the character x and commas.'), 'An error was correctly thrown when invalid characters.');
   }
 
   /**
diff --git a/src/Tests/GlobalSettingsTest.php b/src/Tests/GlobalSettingsTest.php
index bc50000..4150bf7 100644
--- a/src/Tests/GlobalSettingsTest.php
+++ b/src/Tests/GlobalSettingsTest.php
@@ -38,7 +38,6 @@ class GlobalSettingsTest extends DfpTestBase {
    */
   public function testGlobalSettings() {
     $edit = [
-      'adunit_pattern' => 'example.com',
       'network_id' => '123456789',
       'async_rendering' => TRUE,
       'single_request' => TRUE,
@@ -52,16 +51,13 @@ class GlobalSettingsTest extends DfpTestBase {
     $this->assertNoRaw('googletag', 'With no DFP tags set up there is no additional JS added');
 
     // Create a tag.
-    $tag = $this->dfpCreateTag();
-    $tag->set('adunit', '');
-    $tag->save();
+    $this->dfpCreateTag();
 
     $this->drupalGet('<front>');
     $this->assertRaw('googletag.pubads().enableAsyncRendering();', 'Asynchronous rendering is turned on.');
     $this->assertRaw('googletag.pubads().enableSingleRequest();', 'Single request is turned on.');
     $this->assertRaw('googletag.pubads().collapseEmptyDivs();', 'Collapse empty divs is turned on.');
     $this->assertRaw("googletag.pubads().setTargeting('&lt;em&gt;test target&lt;/em&gt;', ['&lt;em&gt;test value&lt;/em&gt;','test value 2']);", 'Global targeting values appear correclty in javascript.');
-    $this->assertRaw('/123456789/example.com');
 
     $edit = [
       'network_id' => '123456789',
diff --git a/src/View/TagView.php b/src/View/TagView.php
index dc74322..a5277ac 100644
--- a/src/View/TagView.php
+++ b/src/View/TagView.php
@@ -140,9 +140,10 @@ class TagView {
     if (is_null($this->adUnit)) {
       $adunit = $this->tag->adunit();
       if (empty($adunit)) {
-        $adunit = $this->globalSettings->get('adunit_pattern');
+        $adunit = $this->globalSettings->get('default_pattern');
       }
       $this->adUnit = '/' . $this->globalSettings->get('network_id') . '/' . $this->token->replace($adunit, $this, ['clear' => TRUE]);
+      $this->moduleHandler->alter('dfp_ad_unit', $this->adUnit);
     }
     return $this->adUnit;
   }
@@ -329,15 +330,8 @@ class TagView {
 
     $sizes = explode(',', $size);
     foreach ($sizes as $size) {
-      if ($size == '<none>') {
-        // If the ad sizes string contains the special keyword "<none>," use an
-        // empty size list in order to suppress slot display.
-        $formatted_sizes[] = '[]';
-      }
-      else {
-        $formatted_size = explode('x', trim($size));
-        $formatted_sizes[] = '[' . implode(', ', $formatted_size) . ']';
-      }
+      $formatted_size = explode('x', trim($size));
+      $formatted_sizes[] = '[' . implode(', ', $formatted_size) . ']';
     }
 
     return count($formatted_sizes) == 1 ? $formatted_sizes[0] : '[' . implode(', ', $formatted_sizes) . ']';
diff --git a/tests/src/Unit/View/TagViewTest.php b/tests/src/Unit/View/TagViewTest.php
index c44a342..95f644f 100644
--- a/tests/src/Unit/View/TagViewTest.php
+++ b/tests/src/Unit/View/TagViewTest.php
@@ -32,7 +32,6 @@ class TagViewTest extends UnitTestCase {
    */
   public function formatSizeProvider() {
     return [
-      ['<none>', '[]'],
       ['300x250 ', '[300, 250]'],
       ['300x250, 728x90 ', '[[300, 250], [728, 90]]'],
     ];
@@ -70,7 +69,7 @@ class TagViewTest extends UnitTestCase {
   public function testGetAdUnit($tag_ad_unit, $default_ad_unit, $network_id, $expected_adunit) {
     $tag = $this->prophesize(TagInterface::class);
     $tag->adunit()->willReturn($tag_ad_unit);
-    $config_factory = $this->getConfigFactoryStub(['dfp.settings' => ['adunit_pattern' => $default_ad_unit, 'network_id' => $network_id]]);
+    $config_factory = $this->getConfigFactoryStub(['dfp.settings' => ['default_pattern' => $default_ad_unit, 'network_id' => $network_id]]);
     $token = $this->getMock(TokenInterface::class);
     $token->method('replace')->willReturnArgument(0);
     $module_handler = $this->prophesize(ModuleHandlerInterface::class)->reveal();
@@ -97,7 +96,7 @@ class TagViewTest extends UnitTestCase {
     $tag->adunit()->willReturn($tag_ad_unit);
     $tag->size()->willReturn($tag_sizes);
     $tag->targeting()->willReturn($tag_targeting);
-    $config_factory = $this->getConfigFactoryStub(['dfp.settings' => ['adunit_pattern' => 'default_adunit', 'network_id' => $network_id]]);
+    $config_factory = $this->getConfigFactoryStub(['dfp.settings' => ['default_pattern' => 'default_adunit', 'network_id' => $network_id]]);
     $token = $this->getMock(TokenInterface::class);
     $token->method('replace')->willReturnArgument(0);
     $module_handler = $this->prophesize(ModuleHandlerInterface::class)->reveal();