diff --git a/buyer_assign_group.xml b/buyer_assign_group.xml
index 61d9f09bf8fa350944a6ee651a89af2d25b2a8ce..846b38ced01fc2a42f1632efedee722533458077 100644
--- a/buyer_assign_group.xml
+++ b/buyer_assign_group.xml
@@ -14,7 +14,6 @@
         <filename>index.html</filename>
         <folder>language</folder>
         <folder>elements</folder>
-        <folder>fields</folder>
     </files>
     <languages folder="language">
         <language tag="en-GB">en-GB/en-GB.plg_vmcustom_buyer_assign_group.ini</language>
@@ -24,9 +23,9 @@
 
     <vmconfig>
         <fields name="params" addfieldpath="/administrator/components/com_virtuemart/fields/">
-			<fieldset name="order_status" addfieldpath="/plugins/vmcustom/buyer_assign_group/fields/">
-				<field name="purchased_status" type="orderstatus" default="C,S" multiple="multiple" label="VMCUSTOM_BUYER_GROUP_STATUS" description="VMCUSTOM_BUYER_GROUP_STATUS_DESC"/>
-			</fieldset>
+            <fieldset name="order_status" addfieldpath="/plugins/vmcustom/buyer_assign_group/fields/">
+                <field name="purchased_status" type="orderstatus" default="C,S" multiple="multiple" label="VMCUSTOM_BUYER_GROUP_STATUS" description="VMCUSTOM_BUYER_GROUP_STATUS_DESC"/>
+            </fieldset>
         </fields>
     </vmconfig>
 
diff --git a/fields/index.html b/fields/index.html
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/fields/vmorderstates.php b/fields/vmorderstates.php
deleted file mode 100644
index 1deb593c0d94531124b08d80ccf15bec0b32b14c..0000000000000000000000000000000000000000
--- a/fields/vmorderstates.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-defined ('_JEXEC') or die();
-/**
- *
- * @package    VirtueMart
- * @subpackage Plugins  - Elements
- * @author Valérie Isaksen
- * @link http://www.virtuemart.net
- * @copyright Copyright (c) 2004 - 2011 VirtueMart Team. All rights reserved.
- * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.php
- * VirtueMart is free software. This version may have been modified pursuant
- * to the GNU General Public License, and as distributed it includes or
- * is derivative of works licensed under the GNU General Public License or
- * other free or open source software licenses.
- * @version $Id:$
- */
-// if (!class_exists('VmConfig'))  require(JPATH_VM_ADMINISTRATOR.DS.'components'.DS.'com_virtuemart'.DS.'helpers'.DS.'config.php');
-// if(!class_exists('VmModel'))    require(JPATH_VM_ADMINISTRATOR.DS.'helpers'.DS.'vmmodel.php');
-
-/*
- * This class is used by VirtueMart Payment or Shipment Plugins
- * which uses JParameter
- * So It should be an extension of JElement
- * Those plugins cannot be configured througth the Plugin Manager anyway.
- */
-// class JElementVmOrderStates extends JElement {
-// 
-// 	/**
-// 	 * Element name
-// 	 *
-// 	 * @access    protected
-// 	 * @var        string
-// 	 */
-// 	var $_name = 'OrderStates';
-// 
-// 	function fetchElement ($name, $value, &$node, $control_name) {
-// 		$statusModel = VmModel::getModel('OrderStatus');
-// 		$fields = $statusModel->getOrderStatusNames();
-// 		$class = 'class="inputbox" multiple="multiple" size="6" ';
-// 
-// 		return JHTML::_ ('select.genericlist', $fields, $control_name . '[' . $name . '][]', $class, 'order_status_code', 'order_status_name', $value, $control_name . $name, true);
-// 	}
-// }
-// <?php
-// defined ('_JEXEC') or die();
-/**
- *
- * @package    VirtueMart
- * @subpackage Plugins  - Elements
- * @author Valérie Isaksen
- * @link http://www.virtuemart.net
- * @copyright Copyright (c) 2004 - 2011 VirtueMart Team. All rights reserved.
- * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.php
- * VirtueMart is free software. This version may have been modified pursuant
- * to the GNU General Public License, and as distributed it includes or
- * is derivative of works licensed under the GNU General Public License or
- * other free or open source software licenses.
- * @version $Id:$
- */
-
-class JFormFieldVmOrderStates extends JFormField {
-        var $type = 'VmOrderStates';
-        function getInput () {
-
-                defined('DS') or define('DS', DIRECTORY_SEPARATOR);
-                if (!class_exists( 'VmConfig' )) require(JPATH_ROOT.DS.'administrator'.DS.'components'.DS.'com_virtuemart'.DS.'helpers'.DS.'config.php');
-
-                if (!class_exists ('VmModel')) {
-                        require(VMPATH_ADMIN . DS . 'helpers' . DS . 'vmmodel.php');
-                }
-                VmConfig::loadConfig ();
-                VmConfig::loadJLang('com_virtuemart');
-                $key = ($this->element['key_field'] ? $this->element['key_field'] : 'value');
-                $val = ($this->element['value_field'] ? $this->element['value_field'] : $this->name);
-                $model = VmModel::getModel ('Orderstatus');
-                $orderStatus = $model->getOrderStatusList ();
-                foreach ($orderStatus as $orderState) {
-                        $orderState->order_status_name = vmText::_ ($orderState->order_status_name);
-                }
-                return JHtml::_ ('select.genericlist', $orderStatus, $this->name, 'class="inputbox" multiple="true" size="6"', 'order_status_code', 'order_status_name', $this->value, $this
-->id);
-        }
-
-}
diff --git a/releases/plg_opentools_vm2_buyer_assign_group_v1.2.zip b/releases/plg_opentools_vm2_buyer_assign_group_v1.2.zip
index 1caf393933f6cec70a6aa82da7e85b9575d0e684..f61cef6c6e7fd98c4e6b995f02cc2b6ded155857 100644
Binary files a/releases/plg_opentools_vm2_buyer_assign_group_v1.2.zip and b/releases/plg_opentools_vm2_buyer_assign_group_v1.2.zip differ