diff --git a/htdocs/app/Controller/LocationsController.php b/htdocs/app/Controller/LocationsController.php
deleted file mode 100644
index 02dbf7b9156a670a425866c914b20a081bc54d7e..0000000000000000000000000000000000000000
--- a/htdocs/app/Controller/LocationsController.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-class LocationsController extends AppController {
-	public function index(){
-
-	}
-}
-
-// vim: ts=4
diff --git a/htdocs/app/Controller/RadiusController.php b/htdocs/app/Controller/RadiusController.php
deleted file mode 100644
index 1670d5c88124ce86564ad4104ae5da33038c83ea..0000000000000000000000000000000000000000
--- a/htdocs/app/Controller/RadiusController.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-class RadiusController extends AppController {
-
-	public function index(){
-
-	}
-}
-
-// vim: ts=4
diff --git a/htdocs/app/Controller/WispUsersAttributesController.php b/htdocs/app/Controller/WispUsersAttributesController.php
deleted file mode 100644
index af36ccacfbb10cabdbd5f670c6e065b5c67da038..0000000000000000000000000000000000000000
--- a/htdocs/app/Controller/WispUsersAttributesController.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-/**
- * Wisp Users Attribute
- */
-class WispUsersAttributesController extends AppController
-{
-	/**
-	 * index function
-	 * @param $Id
-	 */
-	public function index($Id)
-	{
-		$uId = $this->WispUsersAttribute->selectUserId($Id);
-		$userId = $uId[0]['wisp_userdata']['UserID'];
-		if (isset($userId))
-		{
-			$this->WispUsersAttribute->recursive = 0;
-			$this->paginate = array(
-				'limit' => PAGINATION_LIMIT,
-				'conditions' => array('UserID' => $userId)
-			);
-			$wispUsersAttribute  = $this->paginate();
-			$this->set('wispUsersAttribute', $wispUsersAttribute);
-			$this->set('userId', $userId);
-			} else {
-				$this->redirect('/users/index');
-		}
-	}
-
-	//public function add($userId)
-	/*public function add()
-	{
-		//$this->set('userId', $userId);
-		if ($this->request->is('post'))
-		{
-
-			$requestData = $this->request->data;
-			$value = $requestData['WispUsersAttribute']['Value'];
-			$modifier = $requestData['WispUsersAttribute']['Modifier'];
-			$attrValue = $value;
-			if(isset($modifier))
-			{
-				switch($modifier)
-				{
-					case "Seconds":
-						$attrValue = $value / 60;
-						break;
-					case "Minutes":
-						$attrValue = $value;
-						break;
-					case "Hours":
-						$attrValue = $value * 60;
-						break;
-					case "Days":
-						$attrValue = $value * 1440;
-						break;
-					case "Weeks":
-						$attrValue = $value * 10080;
-						break;
-					case "Months":
-						$attrValue = $value * 44640;
-						break;
-					case "MBytes":
-						$attrValue = $value;
-						break;
-					case "GBytes":
-						$attrValue = $value * 1000;
-						break;
-					case "TBytes":
-						$attrValue = $value * 1000000;
-						break;
-				}
-			}
-			$requestData['WispUsersAttribute']['Value'] = $attrValue;
-			//$requestData['WispUsersAttribute']['UserID'] = $userId;
-			$this->WispUsersAttribute->set($requestData);
-
-			if ($this->WispUsersAttribute->validates())
-			{
-				$this->requestAction('/wispUsers/add', array('pass' => $requestData));
-				//$this->Session->write('booking_id', $this->request->data['Booking']['booking_id']);
-				//$a = $this->redirect(array('controller'=>'wispUsers','action'=>'add',$requestData));
-				//echo $a; exit;
-			    //$this->WispUsersAttribute->save($requestData);
-				$this->Session->setFlash(__('Wisp user attribute is saved succefully!', true), 'flash_success');
-			} else {
-			    $this->Session->setFlash(__('Wisp user attribute is not saved!', true), 'flash_failure');
-			}
-		}
-	}*/
-
-	/* edit function
-	 * @param $id, $userId
-	 */
-	public function edit($id, $userId){
-		$wispUsersAttribute = $this->WispUsersAttribute->findById($id);
-		$this->set('wispUsersAttribute', $wispUsersAttribute);
-		if ($this->request->is('post')){
-			$this->request->data['WispUsersAttribute']['Disabled'] = intval($this->request->data['WispUsersAttribute']['Disabled']);
-			$requestData = $this->request->data;
-			//echo "<pre>";print_r($requestData);exit;
-			$value = $requestData['WispUsersAttribute']['Value'];
-			$modifier = $requestData['WispUsersAttribute']['Modifier'];
-			$attrValue = $value;
-			if(isset($modifier))
-			{
-				switch($modifier)
-				{
-					case "Seconds":
-						$attrValue = $value / 60;
-						break;
-					case "Minutes":
-						$attrValue = $value;
-						break;
-					case "Hours":
-						$attrValue = $value * 60;
-						break;
-					case "Days":
-						$attrValue = $value * 1440;
-						break;
-					case "Weeks":
-						$attrValue = $value * 10080;
-						break;
-					case "Months":
-						$attrValue = $value * 44640;
-						break;
-					case "MBytes":
-						$attrValue = $value;
-						break;
-					case "GBytes":
-						$attrValue = $value * 1000;
-						break;
-					case "TBytes":
-						$attrValue = $value * 1000000;
-						break;
-				}
-			}
-			$requestData['WispUsersAttribute']['Value'] = $attrValue;
-			$this->WispUsersAttribute->set($requestData);
-			if ($this->WispUsersAttribute->validates()) {
-				$this->WispUsersAttribute->id = $id;
-			    $this->WispUsersAttribute->save($requestData);
-				$this->Session->setFlash(__('Wisp user attribute is updated succefully!', true), 'flash_success');
-			} else {
-			    $this->Session->setFlash(__('Wisp user attribute is not updated!', true), 'flash_failure');
-			}
-		}
-	}
-	/* delete function
-	 * @param $id, $userId
-	 */
-	public function remove($id, $userId){
-		if (isset($id)){
-			if($this->WispUsersAttribute->delete($id)){
-				$this->redirect('/wispUsers_attributes/index/'.$userId);
-				$this->Session->setFlash(__('Wisp user attribute is removed succefully!', true), 'flash_success');
-			} else {
-				$this->Session->setFlash(__('Wisp user attribute is not removed!', true), 'flash_failure');
-			}
-		} else {
-			$this->redirect('/wispUsers_attributes/index/'.$userId);
-		}
-	}
-
-	/* attribute function
-	 * @param $Id
-	 */
-	public function attribute($id){
-		if ($this->request->is('post')){
-			$this->request->data['UserAttribute'] = $this->request->data['User'];
-			$this->UserAttribute->set($this->request->data);
-			if ($this->UserAttribute->validates()) {
-			    $this->UserAttribute->save($this->request->data);
-				$this->Session->setFlash(__('User attribute is saved succefully!', true), 'flash_success');
-			} else {
-			    $this->Session->setFlash(__('User attribute is not saved succefully!', true), 'flash_failure');
-			}
-		}
-	}
-}
-
-// vim: ts=4
diff --git a/htdocs/app/View/GroupAttributes/attribute.ctp b/htdocs/app/View/GroupAttributes/attribute.ctp
deleted file mode 100644
index df6880ae5d02414699165a8d22d62727badb9b62..0000000000000000000000000000000000000000
--- a/htdocs/app/View/GroupAttributes/attribute.ctp
+++ /dev/null
@@ -1,63 +0,0 @@
-<style type="text/css">
-body {
-	padding-top: 50px;
-}
-</style>
-
-<div style="padding: 15px 15px">
-	<div class="row"><?php echo $this->element('left_panel');?>
-
-	<div class="col-md-10"><legend><?php echo __('Attribute Information')?></legend>
-		<?php echo $this->Form->create()?>
-			<div class="form-group">
-				<?php echo $this->Form->label('Name', 'Name', array('class'=>'col-md-2 control-label'));?>
-				<div class="row">
-					<div class="col-md-4 input-group">
-						<?php echo $this->Form->input('Name', array('label' => false, 'class' => 'form-control', 'placeholder' => 'Name'));?>
-					</div>
-				</div>
-			</div>
-			<div class="form-group">
-				<?php echo $this->Form->label('Operator', 'Operator', array('class'=>'col-md-2 control-label'));?>
-				<div class="row">
-					<div class="col-md-4 input-group">
-						<?php echo $this->Form->input('Operator', array('label' => false, 'class' => 'form-control',
-							 'type' => 'select', 'options' => array('=', ':=', '==', '+=', '!=', '<', '>', '<=', '>=',
-																	'=~', '!~', '=*', '!*', '||==')));?>
-					</div>
-				</div>
-			</div>
-			<div class="form-group">
-				<?php echo $this->Form->label('Value', 'Value', array('class'=>'col-md-2 control-label'));?>
-				<div class="row">
-					<div class="col-md-4 input-group">
-						<?php echo $this->Form->input('Value', array('label' => false, 'class' => 'form-control', 'placeholder' => 'Value'));?>
-					</div>
-				</div>
-			</div>
-			<div class="form-group">
-				<?php echo $this->Form->label('Disabled', 'Disabled', array('class'=>'col-md-2 control-label'));?>
-				<div class="row">
-					<div class="col-md-3">
-						<?php echo $this->Form->checkbox('Disabled');?>
-						<?php echo __('Disabled')?>
-					</div>
-				</div>
-			</div>
-
-			<div class="form-group">
-				<button type="submit" class="btn btn-primary"><?php echo __('Add')?></button>
-				<a class="btn btn-default" href="/users/index" role="button"><?php echo __('Cancel')?></a>
-			</div>
-		<?php echo $this->Form->end(); ?>
-
-	 <!--	<span class="glyphicon glyphicon-time" /> - Processing,
-		<span class="glyphicon glyphicon-edit" /> - Override,
-		<span class="glyphicon glyphicon-import" /> - Being Added,
-		<span class="glyphicon glyphicon-trash" /> - Being Removed,
-		<span class="glyphicon glyphicon-random" /> - Conflicts-->
-		</div>
-	</div>
-</div>
-
-
diff --git a/htdocs/app/View/Locations/index.ctp b/htdocs/app/View/Locations/index.ctp
deleted file mode 100644
index 61ace196d4129411be0800919d883e132b0bf075..0000000000000000000000000000000000000000
--- a/htdocs/app/View/Locations/index.ctp
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-phpinfo();
diff --git a/htdocs/app/View/Radius/index.ctp b/htdocs/app/View/Radius/index.ctp
deleted file mode 100644
index e9cee5ee6a415eda0b6efd2c86aca3b167b9074d..0000000000000000000000000000000000000000
--- a/htdocs/app/View/Radius/index.ctp
+++ /dev/null
@@ -1,21 +0,0 @@
-<style type="text/css">
-body {
-	padding-top: 50px;
-}
-</style>
-
-<div style="padding: 15px 15px">
-	<div class="row">
-		<?php echo $this->element('left_panel');?>
-
-		<div class="col-md-10"><legend>Radius Control Panel</legend>
-			<span
-			class="glyphicon glyphicon-time" /> - Processing, <span
-			class="glyphicon glyphicon-edit" /> - Override, <span
-			class="glyphicon glyphicon-import" /> - Being Added, <span
-			class="glyphicon glyphicon-trash" /> - Being Removed, <span
-			class="glyphicon glyphicon-random" /> - Conflicts
-			</div>
-	</div>
-</div>
-
diff --git a/htdocs/app/View/UserAttributes/attribute.ctp b/htdocs/app/View/UserAttributes/attribute.ctp
deleted file mode 100644
index df6880ae5d02414699165a8d22d62727badb9b62..0000000000000000000000000000000000000000
--- a/htdocs/app/View/UserAttributes/attribute.ctp
+++ /dev/null
@@ -1,63 +0,0 @@
-<style type="text/css">
-body {
-	padding-top: 50px;
-}
-</style>
-
-<div style="padding: 15px 15px">
-	<div class="row"><?php echo $this->element('left_panel');?>
-
-	<div class="col-md-10"><legend><?php echo __('Attribute Information')?></legend>
-		<?php echo $this->Form->create()?>
-			<div class="form-group">
-				<?php echo $this->Form->label('Name', 'Name', array('class'=>'col-md-2 control-label'));?>
-				<div class="row">
-					<div class="col-md-4 input-group">
-						<?php echo $this->Form->input('Name', array('label' => false, 'class' => 'form-control', 'placeholder' => 'Name'));?>
-					</div>
-				</div>
-			</div>
-			<div class="form-group">
-				<?php echo $this->Form->label('Operator', 'Operator', array('class'=>'col-md-2 control-label'));?>
-				<div class="row">
-					<div class="col-md-4 input-group">
-						<?php echo $this->Form->input('Operator', array('label' => false, 'class' => 'form-control',
-							 'type' => 'select', 'options' => array('=', ':=', '==', '+=', '!=', '<', '>', '<=', '>=',
-																	'=~', '!~', '=*', '!*', '||==')));?>
-					</div>
-				</div>
-			</div>
-			<div class="form-group">
-				<?php echo $this->Form->label('Value', 'Value', array('class'=>'col-md-2 control-label'));?>
-				<div class="row">
-					<div class="col-md-4 input-group">
-						<?php echo $this->Form->input('Value', array('label' => false, 'class' => 'form-control', 'placeholder' => 'Value'));?>
-					</div>
-				</div>
-			</div>
-			<div class="form-group">
-				<?php echo $this->Form->label('Disabled', 'Disabled', array('class'=>'col-md-2 control-label'));?>
-				<div class="row">
-					<div class="col-md-3">
-						<?php echo $this->Form->checkbox('Disabled');?>
-						<?php echo __('Disabled')?>
-					</div>
-				</div>
-			</div>
-
-			<div class="form-group">
-				<button type="submit" class="btn btn-primary"><?php echo __('Add')?></button>
-				<a class="btn btn-default" href="/users/index" role="button"><?php echo __('Cancel')?></a>
-			</div>
-		<?php echo $this->Form->end(); ?>
-
-	 <!--	<span class="glyphicon glyphicon-time" /> - Processing,
-		<span class="glyphicon glyphicon-edit" /> - Override,
-		<span class="glyphicon glyphicon-import" /> - Being Added,
-		<span class="glyphicon glyphicon-trash" /> - Being Removed,
-		<span class="glyphicon glyphicon-random" /> - Conflicts-->
-		</div>
-	</div>
-</div>
-
-
diff --git a/htdocs/app/View/Users/attribute.ctp b/htdocs/app/View/Users/attribute.ctp
deleted file mode 100644
index 504757c93a64f74f9cb08920a2cc7baccb4d3c53..0000000000000000000000000000000000000000
--- a/htdocs/app/View/Users/attribute.ctp
+++ /dev/null
@@ -1,63 +0,0 @@
-<style type="text/css">
-body {
-	padding-top: 50px;
-}
-</style>
-
-<div style="padding: 15px 15px">
-	<div class="row"><?php echo $this->element('left_panel');?>
-
-	<div class="col-md-10"><legend><?php echo __('Attribute Information')?></legend>
-		<?php echo $this->Form->create()?>
-			<div class="form-group">
-				<?php echo $this->Form->label('Name', 'Name', array('class'=>'col-md-2 control-label'));?>
-				<div class="row">
-					<div class="col-md-4 input-group">
-						<?php echo $this->Form->input('Name', array('label' => false, 'class' => 'form-control', 'placeholder' => 'Name'));?>
-					</div>
-				</div>
-			</div>
-			<div class="form-group">
-				<?php echo $this->Form->label('Operator', 'Operator', array('class'=>'col-md-2 control-label'));?>
-				<div class="row">
-					<div class="col-md-4 input-group">
-						<?php echo $this->Form->input('Operator', array('label' => false, 'class' => 'form-control',
-							 'type' => 'select', 'options' => array('=', ':=', '==', '+=', '!=', '<', '>', '<=', '>=',
-																	'=~', '!~', '=*', '!*', '||==')));?>
-					</div>
-				</div>
-			</div>
-			<div class="form-group">
-				<?php echo $this->Form->label('Value', 'Value', array('class'=>'col-md-2 control-label'));?>
-				<div class="row">
-					<div class="col-md-4 input-group">
-						<?php echo $this->Form->input('Value', array('label' => false, 'class' => 'form-control', 'placeholder' => 'Value'));?>
-					</div>
-				</div>
-			</div>
-			<div class="form-group">
-				<?php echo $this->Form->label('Disabled', 'Disabled', array('class'=>'col-md-2 control-label'));?>
-				<div class="row">
-					<div class="col-md-3">
-						<?php echo $this->Form->checkbox('Disabled');?>
-						<?php echo __('Disabled')?>
-					</div>
-				</div>
-			</div>
-
-			<div class="form-group">
-				<button type="submit" class="btn btn-primary"><?php echo __('Add')?></button>
-				<a class="btn btn-default" href="/users/index" role="button"><?php echo __('Cancel')?></a>
-			</div>
-		<?php echo $this->Form->end(); ?>
-
-	<!-- 	<span class="glyphicon glyphicon-time" /> - Processing,
-		<span class="glyphicon glyphicon-edit" /> - Override,
-		<span class="glyphicon glyphicon-import" /> - Being Added,
-		<span class="glyphicon glyphicon-trash" /> - Being Removed,
-		<span class="glyphicon glyphicon-random" /> - Conflicts-->
-		</div>
-	</div>
-</div>
-
-
diff --git a/htdocs/app/View/WispUsers/attributes.ctp b/htdocs/app/View/WispUsers/attributes.ctp
deleted file mode 100644
index cf22ba6f98f0ea80b401bbcd721d762f8d783ff4..0000000000000000000000000000000000000000
--- a/htdocs/app/View/WispUsers/attributes.ctp
+++ /dev/null
@@ -1,66 +0,0 @@
-<style type="text/css">
-body {
-	padding-top: 50px;
-}
-</style>
-
-<div style="padding: 15px 15px">
-	<div class="row"><?php echo $this->element('wisp_left_panel');?>
-	<div class="col-md-10"><legend><?php echo __('Add Wisp User Attribute')?></legend>
-		<?php echo $this->Form->create()?>
-			<?php $options = array('Traffic Limit' => 'Traffic Limit', 'Uptime Limit' => 'Uptime Limit', 'IP Address' => 'IP Address', 'MAC Address' => 'MAC Address');
-				$operator=array('Add as reply if unique', 'Set configuration value', 'Match value in request', 'Add reply and set configuration', 'Inverse match value in request', 'Match less-than value in request', 'Match greater-than value in request', 'Match less-than or equal value in request', 'Match greater-than or equal value in request','Match string containing regex in request', 'Match string not containing regex in request', 'Match if attribute is defined in request', 'Match if attribute is not defined in request', 'Match any of these values in request');
-				$modifier = array('Seconds' => 'Seconds', 'Minutes' => 'Minutes', 'Hours' => 'Hours', 'Days' => 'Days', 'Weeks' => 'Weeks', 'Months' => 'Months', 'MBytes' => 'MBytes', 'GBytes' => 'GBytes', 'TBytes' => 'TBytes'); ?>
-			<div class="form-group">
-				<?php echo $this->Form->label('Name', 'Name', array('class'=>'col-md-2 control-label'));?>
-				<div class="row">
-					<div class="col-md-4 input-group">
-						<?php echo $this->Form->input('Name', array('label' => false, 'class' => 'form-control', 'type' => 'select', 'options' => $options, 'empty' => true));?>
-					</div>
-				</div>
-			</div>
-			<div class="form-group">
-				<?php echo $this->Form->label('Operator', 'Operator', array('class'=>'col-md-2 control-label'));?>
-				<div class="row">
-					<div class="col-md-4 input-group">
-						<?php echo $this->Form->input('Operator', array('label' => false, 'class' => 'form-control','type' => 'select', 'options' => $operator, 'empty' => true));
-						?>
-</div>
-				</div>
-			</div>
-			<div class="form-group">
-				<?php echo $this->Form->label('Value', 'Value', array('class'=>'col-md-2 control-label'));?>
-				<div class="row">
-					<div class="col-md-4 input-group">
-						<?php echo $this->Form->input('Value', array('label' => false, 'class' => 'form-control', 'placeholder' => 'Value'));?>
-					</div>
-				</div>
-			</div>
-			<div class="form-group">
-				<?php echo $this->Form->label('Modifier', 'Modifier', array('class'=>'col-md-2 control-label'));?>
-				<div class="row">
-					<div class="col-md-4 input-group">
-						<?php echo $this->Form->input('Modifier', array('label' => false, 'class' => 'form-control','type' => 'select', 'options' => $modifier, 'empty' => true));
-						?>
-</div>
-				</div>
-			</div>
-			<div class="form-group">
-				<button type="submit" class="btn btn-primary"><?php echo __('Add')?></button>
-				<?php //echo $this->Html->link('Cancel', array('controller' => 'wispUsers_attributes', 'action' => 'index', $userId), array('class' => 'btn btn-default'))?>
-
-				<?php echo $this->Html->link('Cancel', array('controller' => 'wispUsers', 'action' => 'add'), array('class' => 'btn btn-default'))?>
-
-			</div>
-		<?php echo $this->Form->end(); ?>
-
-	 	<span class="glyphicon glyphicon-time" /> - Processing,
-		<span class="glyphicon glyphicon-edit" /> - Override,
-		<span class="glyphicon glyphicon-import" /> - Being Added,
-		<span class="glyphicon glyphicon-trash" /> - Being Removed,
-		<span class="glyphicon glyphicon-random" /> - Conflicts
-		</div>
-	</div>
-</div>
-
-
diff --git a/htdocs/app/View/WispUsersAttributes/add.ctp b/htdocs/app/View/WispUsersAttributes/add.ctp
deleted file mode 100644
index cf22ba6f98f0ea80b401bbcd721d762f8d783ff4..0000000000000000000000000000000000000000
--- a/htdocs/app/View/WispUsersAttributes/add.ctp
+++ /dev/null
@@ -1,66 +0,0 @@
-<style type="text/css">
-body {
-	padding-top: 50px;
-}
-</style>
-
-<div style="padding: 15px 15px">
-	<div class="row"><?php echo $this->element('wisp_left_panel');?>
-	<div class="col-md-10"><legend><?php echo __('Add Wisp User Attribute')?></legend>
-		<?php echo $this->Form->create()?>
-			<?php $options = array('Traffic Limit' => 'Traffic Limit', 'Uptime Limit' => 'Uptime Limit', 'IP Address' => 'IP Address', 'MAC Address' => 'MAC Address');
-				$operator=array('Add as reply if unique', 'Set configuration value', 'Match value in request', 'Add reply and set configuration', 'Inverse match value in request', 'Match less-than value in request', 'Match greater-than value in request', 'Match less-than or equal value in request', 'Match greater-than or equal value in request','Match string containing regex in request', 'Match string not containing regex in request', 'Match if attribute is defined in request', 'Match if attribute is not defined in request', 'Match any of these values in request');
-				$modifier = array('Seconds' => 'Seconds', 'Minutes' => 'Minutes', 'Hours' => 'Hours', 'Days' => 'Days', 'Weeks' => 'Weeks', 'Months' => 'Months', 'MBytes' => 'MBytes', 'GBytes' => 'GBytes', 'TBytes' => 'TBytes'); ?>
-			<div class="form-group">
-				<?php echo $this->Form->label('Name', 'Name', array('class'=>'col-md-2 control-label'));?>
-				<div class="row">
-					<div class="col-md-4 input-group">
-						<?php echo $this->Form->input('Name', array('label' => false, 'class' => 'form-control', 'type' => 'select', 'options' => $options, 'empty' => true));?>
-					</div>
-				</div>
-			</div>
-			<div class="form-group">
-				<?php echo $this->Form->label('Operator', 'Operator', array('class'=>'col-md-2 control-label'));?>
-				<div class="row">
-					<div class="col-md-4 input-group">
-						<?php echo $this->Form->input('Operator', array('label' => false, 'class' => 'form-control','type' => 'select', 'options' => $operator, 'empty' => true));
-						?>
-</div>
-				</div>
-			</div>
-			<div class="form-group">
-				<?php echo $this->Form->label('Value', 'Value', array('class'=>'col-md-2 control-label'));?>
-				<div class="row">
-					<div class="col-md-4 input-group">
-						<?php echo $this->Form->input('Value', array('label' => false, 'class' => 'form-control', 'placeholder' => 'Value'));?>
-					</div>
-				</div>
-			</div>
-			<div class="form-group">
-				<?php echo $this->Form->label('Modifier', 'Modifier', array('class'=>'col-md-2 control-label'));?>
-				<div class="row">
-					<div class="col-md-4 input-group">
-						<?php echo $this->Form->input('Modifier', array('label' => false, 'class' => 'form-control','type' => 'select', 'options' => $modifier, 'empty' => true));
-						?>
-</div>
-				</div>
-			</div>
-			<div class="form-group">
-				<button type="submit" class="btn btn-primary"><?php echo __('Add')?></button>
-				<?php //echo $this->Html->link('Cancel', array('controller' => 'wispUsers_attributes', 'action' => 'index', $userId), array('class' => 'btn btn-default'))?>
-
-				<?php echo $this->Html->link('Cancel', array('controller' => 'wispUsers', 'action' => 'add'), array('class' => 'btn btn-default'))?>
-
-			</div>
-		<?php echo $this->Form->end(); ?>
-
-	 	<span class="glyphicon glyphicon-time" /> - Processing,
-		<span class="glyphicon glyphicon-edit" /> - Override,
-		<span class="glyphicon glyphicon-import" /> - Being Added,
-		<span class="glyphicon glyphicon-trash" /> - Being Removed,
-		<span class="glyphicon glyphicon-random" /> - Conflicts
-		</div>
-	</div>
-</div>
-
-
diff --git a/htdocs/app/View/WispUsersAttributes/attribute.ctp b/htdocs/app/View/WispUsersAttributes/attribute.ctp
deleted file mode 100644
index 5bdf1c22d7305b04cb3198e4e89c8cc3ce593f12..0000000000000000000000000000000000000000
--- a/htdocs/app/View/WispUsersAttributes/attribute.ctp
+++ /dev/null
@@ -1,63 +0,0 @@
-<style type="text/css">
-body {
-	padding-top: 50px;
-}
-</style>
-
-<div style="padding: 15px 15px">
-	<div class="row"><?php echo $this->element('left_panel');?>
-
-	<div class="col-md-10"><legend><?php echo __('Attribute Information')?></legend>
-		<?php echo $this->Form->create()?>
-			<div class="form-group">
-				<?php echo $this->Form->label('Name', 'Name', array('class'=>'col-md-2 control-label'));?>
-				<div class="row">
-					<div class="col-md-4 input-group">
-						<?php echo $this->Form->input('Name', array('label' => false, 'class' => 'form-control', 'placeholder' => 'Name'));?>
-					</div>
-				</div>
-			</div>
-			<div class="form-group">
-				<?php echo $this->Form->label('Operator', 'Operator', array('class'=>'col-md-2 control-label'));?>
-				<div class="row">
-					<div class="col-md-4 input-group">
-						<?php echo $this->Form->input('Operator', array('label' => false, 'class' => 'form-control',
-							 'type' => 'select', 'options' => array('=', ':=', '==', '+=', '!=', '<', '>', '<=', '>=',
-																	'=~', '!~', '=*', '!*', '||==')));?>
-					</div>
-				</div>
-			</div>
-			<div class="form-group">
-				<?php echo $this->Form->label('Value', 'Value', array('class'=>'col-md-2 control-label'));?>
-				<div class="row">
-					<div class="col-md-4 input-group">
-						<?php echo $this->Form->input('Value', array('label' => false, 'class' => 'form-control', 'placeholder' => 'Value'));?>
-					</div>
-				</div>
-			</div>
-			<div class="form-group">
-				<?php echo $this->Form->label('Disabled', 'Disabled', array('class'=>'col-md-2 control-label'));?>
-				<div class="row">
-					<div class="col-md-3">
-						<?php echo $this->Form->checkbox('Disabled');?>
-						<?php echo __('Disabled')?>
-					</div>
-				</div>
-			</div>
-
-			<div class="form-group">
-				<button type="submit" class="btn btn-primary"><?php echo __('Add')?></button>
-				<a class="btn btn-default" href="/users/index" role="button"><?php echo __('Cancel')?></a>
-			</div>
-		<?php echo $this->Form->end(); ?>
-
-	 	<span class="glyphicon glyphicon-time" /> - Processing,
-		<span class="glyphicon glyphicon-edit" /> - Override,
-		<span class="glyphicon glyphicon-import" /> - Being Added,
-		<span class="glyphicon glyphicon-trash" /> - Being Removed,
-		<span class="glyphicon glyphicon-random" /> - Conflicts
-		</div>
-	</div>
-</div>
-
-
diff --git a/htdocs/app/View/WispUsersAttributes/edit.ctp b/htdocs/app/View/WispUsersAttributes/edit.ctp
deleted file mode 100644
index 707751d54d2dad2f5d95465c877a4d0f42d02cab..0000000000000000000000000000000000000000
--- a/htdocs/app/View/WispUsersAttributes/edit.ctp
+++ /dev/null
@@ -1,90 +0,0 @@
-<style type="text/css">
-body {
-	padding-top: 50px;
-}
-</style>
-
-<div style="padding: 15px 15px">
-	<div class="row"><?php echo $this->element('wisp_left_panel');?>
-
-	<div class="col-md-10"><legend><?php echo __('Edit User Attribute')?></legend>
-		<?php echo $this->Form->create()?>
-			<!--<div class="form-group">
-				<?php echo $this->Form->label('Name', 'Name', array('class'=>'col-md-2 control-label'));?>
-				<div class="row">
-					<div class="col-md-4 input-group">
-						<?php echo $this->Form->input('Name', array('label' => false, 'class' => 'form-control',
-										'placeholder' => 'Name', 'value' => $wispUsersAttribute['WispUsersAttribute']['Name']));?>
-					</div>
-				</div>
-			</div>-->
-			<div class="form-group">
-				<?php $options = array('Traffic Limit' => 'Traffic Limit', 'Uptime Limit' => 'Uptime Limit', 'IP Address' => 'IP Address', 'MAC Address' => 'MAC Address');
-				$operator=array('Add as reply if unique', 'Set configuration value', 'Match value in request', 'Add reply and set configuration', 'Inverse match value in request', 'Match less-than value in request', 'Match greater-than value in request', 'Match less-than or equal value in request', 'Match greater-than or equal value in request','Match string containing regex in request', 'Match string not containing regex in request', 'Match if attribute is defined in request', 'Match if attribute is not defined in request', 'Match any of these values in request');
-				$modifier = array('Seconds' => 'Seconds', 'Minutes' => 'Minutes', 'Hours' => 'Hours', 'Days' => 'Days', 'Weeks' => 'Weeks', 'Months' => 'Months', 'MBytes' => 'MBytes', 'GBytes' => 'GBytes', 'TBytes' => 'TBytes'); ?>
-				<?php echo $this->Form->label('Name', 'Name', array('class'=>'col-md-2 control-label'));?>
-				<div class="row">
-					<div class="col-md-4 input-group">
-						<?php echo $this->Form->input('Name', array('label' => false, 'class' => 'form-control', 'type' => 'select', 'options' => $options, 'value' => $wispUsersAttribute['WispUsersAttribute']['Name']));?>
-					</div>
-				</div>
-			</div>
-			<div class="form-group">
-				<?php echo $this->Form->label('Operator', 'Operator', array('class'=>'col-md-2 control-label'));?>
-				<div class="row">
-					<div class="col-md-4 input-group">
-						<?php echo $this->Form->input('Operator', array('label' => false, 'class' => 'form-control',
-							 'type' => 'select', 'options' => $operator, 'value' => $wispUsersAttribute['WispUsersAttribute']['Operator']));?>
-					</div>
-				</div>
-			</div>
-			<div class="form-group">
-				<?php echo $this->Form->label('Value', 'Value', array('class'=>'col-md-2 control-label'));?>
-				<div class="row">
-					<div class="col-md-4 input-group">
-						<?php echo $this->Form->input('Value', array('label' => false, 'class' => 'form-control',
-								'placeholder' => 'Value', 'value' => $wispUsersAttribute['WispUsersAttribute']['Value']));?>
-					</div>
-				</div>
-			</div>
-			<div class="form-group">
-				<?php echo $this->Form->label('Modifier', 'Modifier', array('class'=>'col-md-2 control-label'));?>
-				<div class="row">
-					<div class="col-md-4 input-group">
-						<?php echo $this->Form->input('Modifier', array('label' => false, 'class' => 'form-control','type' => 'select', 'options' => $modifier, 'empty' => true));
-						?>
-</div>
-				</div>
-			</div>
-			<div class="form-group">
-				<?php echo $this->Form->label('Disabled', 'Disabled', array('class'=>'col-md-2 control-label'));?>
-				<div class="row">
-					<div class="col-md-3">
-						<?php if($wispUsersAttribute['WispUsersAttribute']['Disabled'] == 1) {
-								 $isCheck = true;
-							} else {
-								$isCheck = false;
-							}
-						?>
-						<?php echo $this->Form->checkbox('Disabled', array('checked' => $isCheck));?>
-						<?php echo __('Disabled')?>
-					</div>
-				</div>
-			</div>
-
-			<div class="form-group">
-				<button type="submit" class="btn btn-primary"><?php echo __('Save', true)?></button>
-				<?php echo $this->Html->link(__('Cancel', true), array('action' => 'index', $wispUsersAttribute['WispUsersAttribute']['UserID']), array('class' => 'btn btn-default'))?>
-			</div>
-		<?php echo $this->Form->end(); ?>
-
-	 	<span class="glyphicon glyphicon-time" /> - Processing,
-		<span class="glyphicon glyphicon-edit" /> - Override,
-		<span class="glyphicon glyphicon-import" /> - Being Added,
-		<span class="glyphicon glyphicon-trash" /> - Being Removed,
-		<span class="glyphicon glyphicon-random" /> - Conflicts
-		</div>
-	</div>
-</div>
-
-
diff --git a/htdocs/app/View/WispUsersAttributes/index.ctp b/htdocs/app/View/WispUsersAttributes/index.ctp
deleted file mode 100644
index 5a33c18716c8dd46c9f935de697c6f6bba1cb48a..0000000000000000000000000000000000000000
--- a/htdocs/app/View/WispUsersAttributes/index.ctp
+++ /dev/null
@@ -1,73 +0,0 @@
-<style type="text/css">
-body {
-	padding-top: 50px;
-}
-</style>
-
-<div style="padding: 15px 15px">
-	<div class="row"><?php echo $this->element('wisp_left_panel');?>
-
-	<div class="col-md-10"><legend>Wisp User Attribute List</legend>
-		<table class="table">
-			<thead>
-				<tr>
-					<th><a><?php echo __('Name', true);?></a></th>
-					<th><a><?php echo __('Operator', true);?></a></th>
-					<th><a><?php echo __('Value', true);?></a></th>
-					<th><a><?php echo __('Actions', true);?></a></th>
-				</tr>
-			</thead>
-			<tbody>
-
-				<?php
-				$options=array('=', ':=', '==', '+=', '!=', '<', '>', '<=', '>=','=~', '!~', '=*', '!*', '||==');
-				foreach ($wispUsersAttribute as $WispUsersAttribute): ?>
-				<tr>
-					<td><? echo __($WispUsersAttribute['WispUsersAttribute']['Name'])?></td>
-					<td><? echo __($options[$WispUsersAttribute['WispUsersAttribute']['Operator']])?></td>
-					<!--<td><? echo __($WispUsersAttribute['WispUsersAttribute']['Operator'])?></td>-->
-					<td><? echo __($WispUsersAttribute['WispUsersAttribute']['Value'])?></td>
-					<td>
-						<?php echo $this->Html->link('<img src="'.BASE_URL.'/resources/custom/images/silk/icons/table_edit.png"></img>',array('controller' => 'wispUsers_attributes',  'action' => 'edit', $WispUsersAttribute['WispUsersAttribute']['ID'], $userId), array('escape' => false, 'title' => 'Edit attribute'));?>
-						<?php echo $this->Html->link('<img src="'.BASE_URL.'/resources/custom/images/silk/icons/table_delete.png"></img>',array('controller' => 'wispUsers_attributes','action' => 'remove', $WispUsersAttribute['WispUsersAttribute']['ID'], $userId), array('escape' => false, 'title' => 'Remove attribute'), 'Are you sure you want to remove this attribute?');?>
-					</td>
-				</tr>
-				<? endforeach; ?>
-
-				<tr>
-					<td align="center" colspan="10">
-
-	<?php
-	$total = $this->Paginator->counter(array(
-    'format' => '%pages%'));
-			if($total >1) {
-
-		echo $this->Paginator->prev('<<', null, null, array('class' => 'disabled')); ?>
-
-					<?php
-					echo $this->Paginator->numbers(); ?>
-<!-- Shows the next and previous links -->
-<?php echo $this->Paginator->next('>>', null, null, array('class' => 'disabled')); ?>
-<!-- prints X of Y, where X is current page and Y is number of pages -->
-<?php
-echo "<span style='margin-left:20px;'>Page : ".$this->Paginator->counter()."</span>";
-}
-?>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<div class="form-group">
-			<?php echo $this->Html->link(__('Add'), array('action' => 'add', $userId), array('class' => 'btn btn-primary'))?>
-			<?php echo $this->Html->link(__('Cancel'), array('controller' => 'wispUsers', 'action' => 'index', $userId), array('class' => 'btn btn-default'))?>
-		</div>
-	 	<span class="glyphicon glyphicon-time" /> - Processing,
-		<span class="glyphicon glyphicon-edit" /> - Override,
-		<span class="glyphicon glyphicon-import" /> - Being Added,
-		<span class="glyphicon glyphicon-trash" /> - Being Removed,
-		<span class="glyphicon glyphicon-random" /> - Conflicts
-		</div>
-	</div>
-</div>
-
-