Index: branches/5.3.x/core/units/site_domains/site_domain_eh.php
===================================================================
diff -u -N -r15677 -r15698
--- branches/5.3.x/core/units/site_domains/site_domain_eh.php	(.../site_domain_eh.php)	(revision 15677)
+++ branches/5.3.x/core/units/site_domains/site_domain_eh.php	(.../site_domain_eh.php)	(revision 15698)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: site_domain_eh.php 15677 2013-01-17 18:52:50Z alex $
+* @version	$Id: site_domain_eh.php 15698 2013-02-19 11:33:17Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2010 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -162,18 +162,19 @@
 					'PrimaryPaymentTypeId', 'PaymentTypes'
 				);
 
+				$config = $event->getUnitConfig();
+
 				// remove field definitions
-				$fields = $this->Application->getUnitOption($event->Prefix, 'Fields');
+				$fields = $config->getFields();
 
 				foreach ($remove_fields as $remove_field) {
 					unset($fields[$remove_field]);
 				}
 
-				$this->Application->setUnitOption($event->Prefix, 'Fields', $fields);
+				$config->setFields($fields);
 
 				// remove grid columns
-				$grids = $this->Application->getUnitOption($event->Prefix, 'Grids', Array ());
-				/* @var $grids Array */
+				$grids = $config->getGrids(Array ());
 
 				foreach ($grids as $grid_name => $grid_info) {
 					foreach ($remove_fields as $remove_field) {
@@ -183,7 +184,7 @@
 					}
 				}
 
-				$this->Application->setUnitOption($event->Prefix, 'Grids', $grids);
+				$config->setGrids($grids);
 			}
 		}