diff --git a/ORM/Connect/DBSchemaManager.php b/ORM/Connect/DBSchemaManager.php
index 945fbedfc..7ac4b336f 100644
--- a/ORM/Connect/DBSchemaManager.php
+++ b/ORM/Connect/DBSchemaManager.php
@@ -8,7 +8,6 @@ use Object;
 use Director;
 use SilverStripe\ORM\FieldType\DBPrimaryKey;
 use SilverStripe\ORM\FieldType\DBField;
-use SilverStripe\ORM\FieldType\DBPrimaryKey;
 
 
 /**
diff --git a/ORM/FieldType/DBHTMLText.php b/ORM/FieldType/DBHTMLText.php
index df5983edb..13e4b57d3 100644
--- a/ORM/FieldType/DBHTMLText.php
+++ b/ORM/FieldType/DBHTMLText.php
@@ -13,10 +13,10 @@ use TextField;
  * This behaves similarly to {@link Text}, but the template processor won't escape any HTML content within it.
  *
  * Options can be specified in a $db config via one of the following:
- *  - "HTMLFragment(['shortcodes=true', 'whitelist=meta,link'])"
- *  - "HTMLFragment('whitelist=meta,link')"
- *  - "HTMLFragment(['shortcodes=true'])". "HTMLText" is also a synonym for this.
- *  - "HTMLFragment('shortcodes=true')"
+ *  - "HTMLFragment(['shortcodes' => true, 'whitelist' => 'meta,link'])"
+ *  - "HTMLFragment(['whitelist' => 'meta,link'])"
+ *  - "HTMLFragment(['shortcodes' => true])". "HTMLText" is also a synonym for this.
+ *  - "HTMLFragment(['shortcodes' => true])"
  *
  * @see HTMLVarchar
  * @see Text
@@ -189,35 +189,6 @@ class DBHTMLText extends DBText {
 		return $value;
 	}
 
-	/**
-	 * Returns true if the field has meaningful content.
-	 * Excludes null content like <h1></h1>, <p></p> ,etc
-	 *
-	 * @return boolean
-	 */
-	public function exists() {
-		// If it's blank, it's blank
-		if(!parent::exists()) {
-			return false;
-		}
-
-		$value = $this->RAW();
-
-		// If it's got a content tag
-		if(preg_match('/<(img|embed|object|iframe|meta|source|link)[^>]*>/i', $value)) {
-			return true;
-		}
-
-		// If it's just one or two tags on its own (and not the above) it's empty.
-		// This might be <p></p> or <h1></h1> or whatever.
-		if(preg_match('/^[\\s]*(<[^>]+>[\\s]*){1,2}$/', $value)) {
-			return false;
-		}
-
-		// Otherwise its content is genuine content
-		return true;
-	}
-
 	public function scaffoldFormField($title = null) {
 		return new HTMLEditorField($this->name, $title);
 	}
diff --git a/ORM/FieldType/DBHTMLVarchar.php b/ORM/FieldType/DBHTMLVarchar.php
index a8b0ebd75..d7c239e5f 100644
--- a/ORM/FieldType/DBHTMLVarchar.php
+++ b/ORM/FieldType/DBHTMLVarchar.php
@@ -115,33 +115,6 @@ class DBHTMLVarchar extends DBVarchar {
 		return trim(\Convert::xml2raw($text));
 	}
 
-	/**
-	 * Returns true if the field has meaningful content.
-	 * Excludes null content like <h1></h1>, <p></p> ,etc
-	 *
-	 * @return boolean
-	 */
-	public function exists() {
-		// If it's blank, it's blank
-		if(!parent::exists()) {
-			return false;
-		}
-
-		// If it's got a content tag
-		if(preg_match('/<(img|embed|object|iframe|meta|source|link)[^>]*>/i', $this->RAW())) {
-			return true;
-		}
-
-		// If it's just one or two tags on its own (and not the above) it's empty.
-		// This might be <p></p> or <h1></h1> or whatever.
-		if(preg_match('/^[\\s]*(<[^>]+>[\\s]*){1,2}$/', $this->RAW())) {
-			return false;
-		}
-
-		// Otherwise its content is genuine content
-		return true;
-	}
-
 	public function scaffoldFormField($title = null) {
 		return new HTMLEditorField($this->name, $title, 1);
 	}
@@ -150,15 +123,4 @@ class DBHTMLVarchar extends DBVarchar {
 		return new TextField($this->name, $title);
 	}
 
-	/**
-	 * @return string
-	 */
-	public function NoHTML()
-	{
-		// Preserve line breaks
-		$text = preg_replace('/\<br(\s*)?\/?\>/i', "\n", $this->RAW());
-		// Convert back to plain text
-		return \Convert::xml2raw(strip_tags($text));
-	}
-
 }
diff --git a/ORM/FieldType/DBString.php b/ORM/FieldType/DBString.php
index 8445f28d2..880b085dc 100644
--- a/ORM/FieldType/DBString.php
+++ b/ORM/FieldType/DBString.php
@@ -35,48 +35,16 @@ abstract class DBString extends DBField {
 	 *                       {@link StringField::setOptions()} for information on the available options
 	 */
 	public function __construct($name = null, $options = array()) {
-		$options = $this->parseConstructorOptions($options);
 		if($options) {
+			if(!is_array($options)) {
+				throw new \InvalidArgumentException("Invalid options $options");
+			}
 			$this->setOptions($options);
 		}
 
 		parent::__construct($name);
 	}
 
-	/**
-	 * Parses the "options" parameter passed to the constructor. This could be a
-	 * string value, or an array of options. Config specification might also
-	 * encode "key=value" pairs in non-associative strings.
-	 *
-	 * @param mixed $options
-	 * @return array The list of parsed options, or empty if there are none
-	 */
-	protected function parseConstructorOptions($options) {
-		if(is_string($options)) {
-			$options = [$options];
-		}
-		if(!is_array($options)) {
-			return [];
-		}
-		$parsed = [];
-		foreach($options as $option => $value) {
-			// Workaround for inability for config args to support associative arrays
-			if(is_numeric($option) && strpos($value, '=') !== false) {
-				list($option, $value) = explode('=', $value);
-				$option = trim($option);
-				$value = trim($value);
-			}
-			// Convert bool values
-			if(strcasecmp($value, 'true') === 0) {
-				$value = true;
-			} elseif(strcasecmp($value, 'false') === 0) {
-				$value = false;
-			}
-			$parsed[$option] = $value;
-		}
-		return $parsed;
-	}
-
 	/**
 	 * Update the optional parameters for this field.
 	 *
diff --git a/admin/code/LeftAndMain.php b/admin/code/LeftAndMain.php
index a8e76fddd..66000222e 100644
--- a/admin/code/LeftAndMain.php
+++ b/admin/code/LeftAndMain.php
@@ -6,8 +6,6 @@
  */
 
 use SilverStripe\Forms\Schema\FormSchema;
-
-use SilverStripe\ORM\Hierarchy\Hierarchy;
 use SilverStripe\ORM\SS_List;
 use SilverStripe\ORM\Versioning\Versioned;
 use SilverStripe\ORM\DataModel;
diff --git a/control/Controller.php b/control/Controller.php
index c7ba4d428..9ac1db9a5 100644
--- a/control/Controller.php
+++ b/control/Controller.php
@@ -1,8 +1,6 @@
 <?php
-use SilverStripe\Model\FieldType\DBHTMLText;
 
 use SilverStripe\ORM\DataModel;
-use SilverStripe\ORM\FieldType\DBHTMLText;
 use SilverStripe\Security\BasicAuth;
 use SilverStripe\Security\Member;
 
diff --git a/docs/en/04_Changelogs/4.0.0.md b/docs/en/04_Changelogs/4.0.0.md
index 1f5bed07a..7118197cb 100644
--- a/docs/en/04_Changelogs/4.0.0.md
+++ b/docs/en/04_Changelogs/4.0.0.md
@@ -942,7 +942,7 @@ For example:
 
 Will become:
 
-	use SilverStripe\Model\FieldType\DBVarchar;
+	use SilverStripe\ORM\FieldType\DBVarchar;
 
 	class MyObject extends DataObject {
 	    private static $db = array(
diff --git a/forms/DatalessField.php b/forms/DatalessField.php
index 9081d9127..27ba0eb46 100644
--- a/forms/DatalessField.php
+++ b/forms/DatalessField.php
@@ -1,4 +1,6 @@
 <?php
+use SilverStripe\ORM\FieldType\DBHTMLText;
+
 /**
  * Abstract class for all fields without data.
  * Labels, headings and the like should extend from this.
@@ -32,7 +34,7 @@ class DatalessField extends FormField {
 	 * Returns the field's representation in the form.
 	 * For dataless fields, this defaults to $Field.
 	 *
-	 * @return string
+	 * @return DBHTMLText
 	 */
 	public function FieldHolder($properties = array()) {
 		return $this->Field($properties);
@@ -41,6 +43,8 @@ class DatalessField extends FormField {
 	/**
 	 * Returns the field's representation in a field group.
 	 * For dataless fields, this defaults to $Field.
+	 *
+	 * @return DBHTMLText
 	 */
 	public function SmallFieldHolder($properties = array()) {
 		return $this->Field($properties);
diff --git a/forms/Form.php b/forms/Form.php
index 92a0e6e1d..7edee9dd3 100644
--- a/forms/Form.php
+++ b/forms/Form.php
@@ -3,9 +3,7 @@
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\FieldType\DBField;
 use SilverStripe\ORM\DataObjectInterface;
-use SilverStripe\ORM\FieldType\DBHTMLText;
 use SilverStripe\ORM\SS_List;
-use SilverStripe\ORM\FieldType\DBHTMLText;
 use SilverStripe\Security\SecurityToken;
 use SilverStripe\Security\NullSecurityToken;
 
@@ -497,8 +495,8 @@ class Form extends RequestHandler {
 			|| $this->actions->dataFieldByName('action_' . $action)
 			// Always allow actions on fields
 			|| (
-				$field = $this->checkFieldsForAction($this->Fields(), $action)
-				&& $field->checkAccessAction($action)
+				($field = $this->checkFieldsForAction($this->Fields(), $action))
+					&& $field->checkAccessAction($action)
 			)
 		);
 	}
diff --git a/forms/FormAction.php b/forms/FormAction.php
index 3aabbb9ed..af5613999 100644
--- a/forms/FormAction.php
+++ b/forms/FormAction.php
@@ -1,4 +1,6 @@
 <?php
+use SilverStripe\ORM\FieldType\DBHTMLText;
+
 /**
  * The action buttons are <input type="submit"> as well as <button> tags.
  *
@@ -108,7 +110,7 @@ class FormAction extends FormField {
 
 	/**
 	 * @param array $properties
-	 * @return string
+	 * @return DBHTMLText
 	 */
 	public function FieldHolder($properties = array()) {
 		return $this->Field($properties);
diff --git a/forms/FormField.php b/forms/FormField.php
index 614c9a61f..97756113f 100644
--- a/forms/FormField.php
+++ b/forms/FormField.php
@@ -2,6 +2,7 @@
 
 use SilverStripe\ORM\DataObjectInterface;
 use SilverStripe\ORM\FieldType\DBField;
+use SilverStripe\ORM\FieldType\DBHTMLText;
 
 /**
  * Represents a field in a form.
@@ -940,7 +941,7 @@ class FormField extends RequestHandler {
 	 * such as an input tag.
 	 *
 	 * @param array $properties
-	 * @return string
+	 * @return DBHTMLText
 	 */
 	public function Field($properties = array()) {
 		$context = $this;
@@ -974,7 +975,7 @@ class FormField extends RequestHandler {
 	 *
 	 * @param array $properties
 	 *
-	 * @return string
+	 * @return DBHTMLText
 	 */
 	public function FieldHolder($properties = array()) {
 		$context = $this;
diff --git a/forms/LookupField.php b/forms/LookupField.php
index 3aeebb3b3..3d0668195 100644
--- a/forms/LookupField.php
+++ b/forms/LookupField.php
@@ -1,6 +1,6 @@
 <?php
-use SilverStripe\Model\FieldType\DBField;
 
+use SilverStripe\ORM\FieldType\DBField;
 use SilverStripe\ORM\DataObjectInterface;
 
 /**
diff --git a/parsers/TextParser.php b/parsers/TextParser.php
index 0f4bd578c..74ad4dbcf 100644
--- a/parsers/TextParser.php
+++ b/parsers/TextParser.php
@@ -1,5 +1,6 @@
 <?php
-use SilverStripe\Model\FieldType\DBField;
+
+use SilverStripe\ORM\FieldType\DBField;
 
 /**
  * Parses text in a variety of ways.
diff --git a/tests/model/DBHTMLTextTest.php b/tests/model/DBHTMLTextTest.php
index 7f83db342..19faa1d9a 100644
--- a/tests/model/DBHTMLTextTest.php
+++ b/tests/model/DBHTMLTextTest.php
@@ -204,6 +204,29 @@ class DBHTMLTextTest extends SapphireTest {
 		$this->assertEquals($expectedValue, $result);
 	}
 
+	public function testCreate() {
+		/** @var DBHTMLText $field */
+		$field = Object::create_from_string("HTMLFragment(['whitelist' => 'link'])", 'MyField');
+		$this->assertEquals(['link'], $field->getWhitelist());
+		$field = Object::create_from_string("HTMLFragment(['whitelist' => 'link,a'])", 'MyField');
+		$this->assertEquals(['link', 'a'], $field->getWhitelist());
+		$field = Object::create_from_string("HTMLFragment(['whitelist' => ['link', 'a']])", 'MyField');
+		$this->assertEquals(['link', 'a'], $field->getWhitelist());
+		$field = Object::create_from_string("HTMLFragment", 'MyField');
+		$this->assertEmpty($field->getWhitelist());
+
+		// Test shortcodes
+		$field = Object::create_from_string("HTMLFragment(['shortcodes' => true])", 'MyField');
+		$this->assertEquals(true, $field->getProcessShortcodes());
+		$field = Object::create_from_string("HTMLFragment(['shortcodes' => false])", 'MyField');
+		$this->assertEquals(false, $field->getProcessShortcodes());
+
+		// Mix options
+		$field = Object::create_from_string("HTMLFragment(['shortcodes' => true, 'whitelist' => ['a'])", 'MyField');
+		$this->assertEquals(true, $field->getProcessShortcodes());
+		$this->assertEquals(['a'], $field->getWhitelist());
+	}
+
 	public function providerToPlain()
 	{
 		return [
@@ -335,7 +358,7 @@ class DBHTMLTextTest extends SapphireTest {
 		$this->assertEquals('&quot;this is a test&quot;', $data->ATT());
 
 		// HTML Text (passes shortcodes + tidy)
-		$data = DBField::create_field('HTMLText', '&quot;');
+		$data = DBField::create_field('HTMLText', '"');
 		$this->assertEquals('&quot;', $data->ATT());
 	}
 
@@ -397,45 +420,19 @@ class DBHTMLTextTest extends SapphireTest {
 		$h = new DBHTMLText();
 		$h->setValue("");
 		$this->assertFalse($h->exists());
-		$h->setValue("<p></p>");
-		$this->assertFalse($h->exists());
-		$h->setValue("<p> </p>");
-		$this->assertFalse($h->exists());
-		$h->setValue("<h2/>");
-		$this->assertFalse($h->exists());
-		$h->setValue("<h2></h2>");
-		$this->assertFalse($h->exists());
-
-		$h->setValue("something");
-		$this->assertTrue($h->exists());
-		$h->setValue("<img src=\"dummy.png\">");
-		$this->assertTrue($h->exists());
-		$h->setValue("<img src=\"dummy.png\"><img src=\"dummy.png\">");
-		$this->assertTrue($h->exists());
-		$h->setValue("<p><img src=\"dummy.png\"></p>");
-		$this->assertTrue($h->exists());
-
-		$h->setValue("<iframe src=\"http://www.google.com\"></iframe>");
-		$this->assertTrue($h->exists());
-		$h->setValue("<embed src=\"test.swf\">");
-		$this->assertTrue($h->exists());
-		$h->setValue("<object width=\"400\" height=\"400\" data=\"test.swf\"></object>");
-		$this->assertTrue($h->exists());
-
-
-		$h->setValue("<p>test</p>");
+		$h->setValue("<p>content</p>");
 		$this->assertTrue($h->exists());
 	}
 
 	function testWhitelist() {
-		$textObj = new DBHTMLText('Test', 'whitelist=meta,link');
+		$textObj = new DBHTMLText('Test', ['whitelist'=> 'meta,link']);
 		$this->assertEquals(
 			'<meta content="Keep"><link href="Also Keep">',
 			$textObj->whitelistContent('<meta content="Keep"><p>Remove</p><link href="Also Keep" />Remove Text'),
 			'Removes any elements not in whitelist excluding text elements'
 		);
 
-		$textObj = new DBHTMLText('Test', 'whitelist=meta,link,text()');
+		$textObj = new DBHTMLText('Test', ['whitelist'=> 'meta,link,text()']);
 		$this->assertEquals(
 			'<meta content="Keep"><link href="Also Keep">Keep Text',
 			$textObj->whitelistContent('<meta content="Keep"><p>Remove</p><link href="Also Keep" />Keep Text'),
@@ -528,7 +525,7 @@ class DBHTMLTextTest extends SapphireTest {
 		);
 		$this->assertEquals(
 			'Replaced short code with this. home',
-			$field->NoHTML()
+			$field->Plain()
 		);
 		Config::nest();
 		Config::inst()->update('Director', 'alternate_base_url', 'http://example.com/');
@@ -550,11 +547,7 @@ class DBHTMLTextTest extends SapphireTest {
 			$field->Summary(2)
 		);
 		$this->assertEquals(
-			'Replaced short code with...',
-			$field->BigSummary(4)
-		);
-		$this->assertEquals(
-			'Replaced short code with this. home[home]',
+			'Replaced short code with this. home',
 			$field->FirstParagraph()
 		);
 		$this->assertEquals(
diff --git a/tests/model/DataObjectTest.php b/tests/model/DataObjectTest.php
index 990f4a591..660933003 100644
--- a/tests/model/DataObjectTest.php
+++ b/tests/model/DataObjectTest.php
@@ -1534,13 +1534,6 @@ class DataObjectTest extends SapphireTest {
 		$this->assertTrue($team->hasValue('Title', null, false));
 		$this->assertFalse($team->hasValue('DatabaseField', null, false));
 
-		$team->DatabaseField = '<p></p>';
-		$this->assertTrue($team->hasValue('Title', null, false));
-		$this->assertFalse (
-			$team->hasValue('DatabaseField', null, false),
-			'Test that a blank paragraph on a HTML field is not a valid value.'
-		);
-
 		$team->Title = '<p></p>';
 		$this->assertTrue (
 			$team->hasValue('Title', null, false),
diff --git a/tests/view/SSViewerTest.php b/tests/view/SSViewerTest.php
index c5bb6297c..87f6ae127 100644
--- a/tests/view/SSViewerTest.php
+++ b/tests/view/SSViewerTest.php
@@ -5,7 +5,7 @@ use SilverStripe\ORM\DataObject;
 use SilverStripe\Security\Member;
 use SilverStripe\Security\SecurityToken;
 use SilverStripe\Security\Permission;
-use SilverStripe\Model\FieldType\DBField;
+use SilverStripe\ORM\FieldType\DBField;
 
 class SSViewerTest extends SapphireTest {
 
@@ -175,7 +175,7 @@ class SSViewerTest extends SapphireTest {
 		// first make sure that our test js file causes an exception to be thrown
 		try{
 			require_once('thirdparty/jsmin/jsmin.php');
-			$content = JSMin::minify($content);
+			JSMin::minify($jsFileContents);
 			$this->fail('JSMin did not throw exception on minify bad file: ');
 		} catch(Exception $e) {
 			// exception thrown... good
diff --git a/tests/view/ViewableDataTest.php b/tests/view/ViewableDataTest.php
index 62a68d47d..8f11a86af 100644
--- a/tests/view/ViewableDataTest.php
+++ b/tests/view/ViewableDataTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use SilverStripe\Model\FieldType\DBField;
+use SilverStripe\ORM\FieldType\DBField;
 
 /**
  * See {@link SSViewerTest->testCastingHelpers()} for more tests related to casting and ViewableData behaviour,
diff --git a/view/SSViewer.php b/view/SSViewer.php
index 058e2635e..3ce381ebe 100644
--- a/view/SSViewer.php
+++ b/view/SSViewer.php
@@ -35,10 +35,10 @@ class SSViewer_Scope {
 	const UP_INDEX = 4;
 	const CURRENT_INDEX = 5;
 	const ITEM_OVERLAY = 6;
-	
+
 	// The stack of previous "global" items
 	// An indexed array of item, item iterator, item iterator total, pop index, up index, current index & parent overlay
-	private $itemStack = array(); 
+	private $itemStack = array();
 
 	// The current "global" item (the one any lookup starts from)
 	protected $item;
diff --git a/view/ViewableData.php b/view/ViewableData.php
index 1e93d715e..10c988583 100644
--- a/view/ViewableData.php
+++ b/view/ViewableData.php
@@ -1,8 +1,6 @@
 <?php
 
-use SilverStripe\Model\FieldType\DBVarchar;
-use SilverStripe\Model\FieldType\DBField;
-use SilverStripe\Model\FieldType\DBHTMLText;
+use SilverStripe\ORM\FieldType\DBField;
 
 /**
  * A ViewableData object is any object that can be rendered into a template/view.
@@ -399,9 +397,9 @@ class ViewableData extends Object implements IteratorAggregate {
 			// Force cast
 			$castingHelper = $this->castingHelper($fieldName);
 			$valueObject = Object::create_from_string($castingHelper, $fieldName);
-				$valueObject->setValue($value, $this);
-				$value = $valueObject;
-			}
+			$valueObject->setValue($value, $this);
+			$value = $valueObject;
+		}
 
 		// Record in cache
 		if($cache) {