diff --git a/components/com_users/Model/UserModel.php b/components/com_users/Model/UserModel.php
index 3ed23cb980fdf..896a55f726de5 100644
--- a/components/com_users/Model/UserModel.php
+++ b/components/com_users/Model/UserModel.php
@@ -16,20 +16,20 @@
 use Joomla\Database\ParameterType;
 
 /**
- * This models retrieves some data of a user.
+ * This models retrieves some data of a User.
  *
- * @since  4.0
+ * @since   __deploy_version__
  */
 class UserModel extends ItemModel
 {
 	/**
-	 * Load the Author data.
+	 * Load the User data.
 	 *
-	 * @param   integer  $id  ID of Author
+	 * @param   integer  $id  ID of User
 	 *
 	 * @return  object  The product information.
 	 * @throws  Exception
-	 * @since   1.0.0
+	 * @since   __deploy_version__
 	 */
 	public function getItem($id = null)
 	{
diff --git a/components/com_users/Model/UsersModel.php b/components/com_users/Model/UsersModel.php
index a255649b9c761..18554c91d4690 100644
--- a/components/com_users/Model/UsersModel.php
+++ b/components/com_users/Model/UsersModel.php
@@ -21,43 +21,25 @@
 /**
  * This models supports retrieving a list of users.
  *
- * @since  4.0
+ * @since   __deploy_version__
  */
 class UsersModel extends ListModel
 {
 	/**
 	 * User items data
 	 *
-	 * @var array
-	 * @since   4.0
+	 * @var     array
+	 * @since   __deploy_version__
 	 */
 	protected $item = null;
 
-	/**
-	 * The category that applies.
-	 *
-	 * @var        object
-	 * @access    protected
-	 * @since     4.0
-	 */
-	protected $category = null;
-
-	/**
-	 * The list of other contact categories.
-	 *
-	 * @var       array
-	 * @access    protected
-	 * @since     4.0
-	 */
-	protected $categories = null;
-
 	/**
 	 * Constructor
 	 *
 	 * @param   array  $config  An optional associative array of configuration settings.
 	 *
-	 * @throws Exception
-	 * @since   4.0
+	 * @throws  Exception
+	 * @since   __deploy_version__
 	 */
 	public function __construct($config = array())
 	{
@@ -81,7 +63,7 @@ public function __construct($config = array())
 	 * Method to get a list of items.
 	 *
 	 * @return  mixed  An array of objects on success, false on failure.
-	 * @since   4.0
+	 * @since   __deploy_version__
 	 */
 	public function getItems()
 	{
@@ -95,8 +77,8 @@ public function getItems()
 	 * Method to build an SQL query to load the list data.
 	 *
 	 * @return  string    An SQL query
-	 * @throws Exception
-	 * @since   4.0
+	 * @throws  Exception
+	 * @since   __deploy_version__
 	 */
 	protected function getListQuery()
 	{
@@ -176,7 +158,7 @@ protected function getListQuery()
 	 *
 	 * @return  void
 	 * @throws  Exception
-	 * @since   1.6
+	 * @since   __deploy_version__
 	 */
 	protected function populateState($ordering = null, $direction = null)
 	{
diff --git a/components/com_users/View/User/HtmlView.php b/components/com_users/View/User/HtmlView.php
index 5787f7377b56f..b2dfc75bdc25d 100644
--- a/components/com_users/View/User/HtmlView.php
+++ b/components/com_users/View/User/HtmlView.php
@@ -19,15 +19,15 @@
 /**
  * View class for Single User
  *
- * @since  4.0
+ * @since   __deploy_version__
  */
 class HtmlView extends BaseHtmlView
 {
 	/**
-	 * The Author data
+	 * The User data
 	 *
 	 * @var    object
-	 * @since  1.0.0
+	 * @since   __deploy_version__
 	 */
 	protected $item;
 
@@ -35,7 +35,7 @@ class HtmlView extends BaseHtmlView
 	 * The model state
 	 *
 	 * @var    Joomla\Registry\Registry
-	 * @since  1.0.0
+	 * @since   __deploy_version__
 	 */
 	protected $state;
 
@@ -44,11 +44,9 @@ class HtmlView extends BaseHtmlView
 	 *
 	 * @param   string  $tpl  The template file to include
 	 *
-	 * @return  mixed
-	 *
+	 * @return  void
 	 * @throws  Exception
-	 *
-	 * @since   1.0.0
+	 * @since   __deploy_version__
 	 */
 	public function display($tpl = null)
 	{
diff --git a/components/com_users/View/Users/HtmlView.php b/components/com_users/View/Users/HtmlView.php
index 0a11c67e7c306..980301f526fed 100644
--- a/components/com_users/View/Users/HtmlView.php
+++ b/components/com_users/View/Users/HtmlView.php
@@ -20,7 +20,7 @@
 /**
  * View class for Users
  *
- * @since  4.0
+ * @since   __deploy_version__
  */
 class HtmlView extends BaseHtmlView
 {
@@ -28,7 +28,7 @@ class HtmlView extends BaseHtmlView
 	 * An array of items
 	 *
 	 * @var     array
-	 * @since   4.0
+	 * @since   __deploy_version__
 	 */
 	protected $items;
 
@@ -36,7 +36,7 @@ class HtmlView extends BaseHtmlView
 	 * The pagination object
 	 *
 	 * @var     JPagination
-	 * @since   4.0
+	 * @since   __deploy_version__
 	 */
 	protected $pagination;
 
@@ -44,7 +44,7 @@ class HtmlView extends BaseHtmlView
 	 * The model state
 	 *
 	 * @var     object
-	 * @since   4.0
+	 * @since   __deploy_version__
 	 */
 	protected $state;
 
@@ -52,7 +52,7 @@ class HtmlView extends BaseHtmlView
 	 * The page parameters
 	 *
 	 * @var    Registry|null
-	 * @since  4.0.0
+	 * @since   __deploy_version__
 	 */
 	protected $params = null;
 
@@ -61,7 +61,7 @@ class HtmlView extends BaseHtmlView
 	 *
 	 * @return  void
 	 * @throws  Exception
-	 * @since   1.0.0
+	 * @since   __deploy_version__
 	 */
 	public function display($tpl = null)
 	{
@@ -75,7 +75,7 @@ public function display($tpl = null)
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
 		{
-			throw new Exception(implode("\n", $errors));
+			throw new Exception(implode("\n", $errors), 500);
 		}
 
 		parent::display($tpl);
diff --git a/components/com_users/tmpl/users/default.xml b/components/com_users/tmpl/users/default.xml
index c931388747e2c..bac775f9eccdb 100644
--- a/components/com_users/tmpl/users/default.xml
+++ b/components/com_users/tmpl/users/default.xml
@@ -12,18 +12,13 @@
     <!-- Add fields to the parameters object for the layout. -->
     <fields name="params">
         <fieldset name="basic" label="COM_USERS_TAB">
-            <field
-                    name="layout_type"
-                    type="hidden"
-                    default="blog"
-            />
+
             <field
                     name="groups"
                     type="usergrouplist"
                     label="COM_USERS_PARAMS_SELECT_GROUPS"
                     required="true"
                     multiple="true"
-                    class="2do"
             />
 
             <field