From 5cabe36fe85a780a9fb808343d6341f15da13524 Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Mon, 12 Apr 2021 08:17:37 -0400
Subject: Fix ccsdk version and remove admportal

Fix ccsdk versions and remove admportal, which is no longer supported

Change-Id: Iaee9bd2b7d5d7345f889357684df18d53db466a1
Issue-ID: SDNC-1507
Signed-off-by: Dan Timoney <dtimoney@att.com>

Former-commit-id: a1d57d8f5131414429f9ef2d8b0468004d253d0a
---
 admportal/views/partials/add_service_homing.ejs    |  52 -------
 admportal/views/partials/alts_credentials.ejs      |  65 --------
 admportal/views/partials/dhcp.ejs                  |  66 --------
 admportal/views/partials/env.ejs                   |   1 -
 admportal/views/partials/equipment.ejs             |  58 -------
 admportal/views/partials/excluded_v4_address.ejs   |  38 -----
 .../excluded_v4_address_from_default_pool.ejs      |  38 -----
 .../excluded_v6_address_from_default_pool.ejs      |  38 -----
 admportal/views/partials/excluded_v6_addresses.ejs |  38 -----
 admportal/views/partials/feature_list.ejs          |  50 ------
 admportal/views/partials/firewall_lite.ejs         |  43 ------
 admportal/views/partials/footer.ejs                |   5 -
 admportal/views/partials/form.ejs                  |  55 -------
 admportal/views/partials/gammaHeader.ejs           |  63 --------
 admportal/views/partials/head.ejs                  |  20 ---
 admportal/views/partials/head.ejs.orig             |  13 --
 admportal/views/partials/header.ejs                |  11 --
 admportal/views/partials/header.ejs.orig           |  55 -------
 admportal/views/partials/interface.ejs             |  42 -----
 admportal/views/partials/internet_evc_modal.ejs    |  44 ------
 .../partials/ipv4_infrastructure_static_route.ejs  |  50 ------
 .../partials/ipv6_infrastructure_static_route.ejs  |  50 ------
 .../views/partials/l2_homing_information_modal.ejs |  46 ------
 .../partials/l3_interface_ipv4_address_list.ejs    |  42 -----
 .../partials/l3_interface_ipv6_address_list.ejs    |  42 -----
 admportal/views/partials/l3sdn_vnf_fields.ejs      |  70 ---------
 admportal/views/partials/link_latency_master.ejs   | 100 ------------
 admportal/views/partials/link_master.ejs           | 109 -------------
 admportal/views/partials/max_port_speed.ejs        |  86 -----------
 admportal/views/partials/max_server_speed.ejs      |  88 -----------
 .../views/partials/metroroadm_service_request.ejs  | 170 ---------------------
 admportal/views/partials/nat.ejs                   |  38 -----
 admportal/views/partials/nb_vlan_pool.ejs          |  38 -----
 admportal/views/partials/nb_vlan_range.ejs         |  45 ------
 admportal/views/partials/ncs_credentials.ejs       |  74 ---------
 admportal/views/partials/network_connections.ejs   |  66 --------
 admportal/views/partials/network_profile.ejs       |  59 -------
 admportal/views/partials/new_parameter.ejs         |  37 -----
 admportal/views/partials/newuserform.ejs           |  38 -----
 admportal/views/partials/oper_status_modal.ejs     |  68 ---------
 admportal/views/partials/owbc_properties.ejs       |  98 ------------
 admportal/views/partials/partner_properties.ejs    |  74 ---------
 admportal/views/partials/pat.ejs                   |  50 ------
 admportal/views/partials/pat_pools.ejs             |  46 ------
 admportal/views/partials/phs_credentials.ejs       |  92 -----------
 .../views/partials/request_information_modal.ejs   |  60 --------
 admportal/views/partials/resource_rule.ejs         | 118 --------------
 admportal/views/partials/ro_header.ejs             |  43 ------
 admportal/views/partials/roadm_mapping.ejs         | 101 ------------
 admportal/views/partials/router_master.ejs         |  59 -------
 admportal/views/partials/routing_protocol.ejs      |  38 -----
 .../views/partials/sdnc_request_header_modal.ejs   |  46 ------
 admportal/views/partials/sdnfcHeader.ejs           |  61 --------
 admportal/views/partials/sdnmlcHeader.ejs          |  63 --------
 .../views/partials/service_information_modal.ejs   |  46 ------
 .../views/partials/service_manager_credentials.ejs |  65 --------
 admportal/views/partials/service_status_modal.ejs  |  68 ---------
 admportal/views/partials/startssl.sh               |  28 ----
 .../views/partials/svc_config_additional_data.ejs  |  38 -----
 .../svc_topology_additional_data_modal.ejs         |  36 -----
 .../partials/t_provided_v4_lan_public_prefixes.ejs |  46 ------
 .../partials/t_provided_v6_lan_public_prefixes.ejs |  46 ------
 admportal/views/partials/tcp_port_list.ejs         |  38 -----
 admportal/views/partials/threshold_alarm.ejs       |  71 ---------
 admportal/views/partials/udp_port_list.ejs         |  38 -----
 admportal/views/partials/update_aic_avail_zone.ejs |  54 -------
 admportal/views/partials/update_aic_site.ejs       |  57 -------
 admportal/views/partials/update_aic_switch.ejs     |  41 -----
 admportal/views/partials/update_max_port_speed.ejs |  45 ------
 admportal/views/partials/update_parameter.ejs      |  38 -----
 admportal/views/partials/update_resource_rule.ejs  |  57 -------
 admportal/views/partials/update_service_homing.ejs |  55 -------
 admportal/views/partials/update_vlan_id_pool.ejs   |  51 -------
 admportal/views/partials/update_vpe_pool.ejs       |  88 -----------
 admportal/views/partials/update_vplspe_pool.ejs    |  72 ---------
 admportal/views/partials/userform.ejs              |  42 -----
 admportal/views/partials/v4_dhcp_pools.ejs         |  50 ------
 .../views/partials/v4_firewall_packet_filters.ejs  |  46 ------
 .../views/partials/v4_nat_mapping_entries.ejs      |  46 ------
 admportal/views/partials/v4_static_routes.ejs      |  46 ------
 admportal/views/partials/v6_dhcp_pools.ejs         |  50 ------
 .../views/partials/v6_firewall_packet_filters.ejs  |  46 ------
 admportal/views/partials/v6_static_routes.ejs      |  46 ------
 admportal/views/partials/vlan.ejs                  |  46 ------
 admportal/views/partials/vm_networks.ejs           |  57 -------
 admportal/views/partials/vm_profile.ejs            |  32 ----
 admportal/views/partials/vnf_network.ejs           |  28 ----
 admportal/views/partials/vnf_profile.ejs           |  33 ----
 admportal/views/partials/vnf_vm_information.ejs    |  42 -----
 admportal/views/partials/vr_lan_interface.ejs      |  66 --------
 admportal/views/partials/vrr_credentials.ejs       |  82 ----------
 91 files changed, 4896 deletions(-)
 delete mode 100644 admportal/views/partials/add_service_homing.ejs
 delete mode 100644 admportal/views/partials/alts_credentials.ejs
 delete mode 100644 admportal/views/partials/dhcp.ejs
 delete mode 100644 admportal/views/partials/env.ejs
 delete mode 100644 admportal/views/partials/equipment.ejs
 delete mode 100644 admportal/views/partials/excluded_v4_address.ejs
 delete mode 100644 admportal/views/partials/excluded_v4_address_from_default_pool.ejs
 delete mode 100644 admportal/views/partials/excluded_v6_address_from_default_pool.ejs
 delete mode 100644 admportal/views/partials/excluded_v6_addresses.ejs
 delete mode 100644 admportal/views/partials/feature_list.ejs
 delete mode 100644 admportal/views/partials/firewall_lite.ejs
 delete mode 100644 admportal/views/partials/footer.ejs
 delete mode 100644 admportal/views/partials/form.ejs
 delete mode 100644 admportal/views/partials/gammaHeader.ejs
 delete mode 100644 admportal/views/partials/head.ejs
 delete mode 100644 admportal/views/partials/head.ejs.orig
 delete mode 100644 admportal/views/partials/header.ejs
 delete mode 100644 admportal/views/partials/header.ejs.orig
 delete mode 100644 admportal/views/partials/interface.ejs
 delete mode 100644 admportal/views/partials/internet_evc_modal.ejs
 delete mode 100644 admportal/views/partials/ipv4_infrastructure_static_route.ejs
 delete mode 100644 admportal/views/partials/ipv6_infrastructure_static_route.ejs
 delete mode 100644 admportal/views/partials/l2_homing_information_modal.ejs
 delete mode 100644 admportal/views/partials/l3_interface_ipv4_address_list.ejs
 delete mode 100644 admportal/views/partials/l3_interface_ipv6_address_list.ejs
 delete mode 100644 admportal/views/partials/l3sdn_vnf_fields.ejs
 delete mode 100644 admportal/views/partials/link_latency_master.ejs
 delete mode 100644 admportal/views/partials/link_master.ejs
 delete mode 100644 admportal/views/partials/max_port_speed.ejs
 delete mode 100644 admportal/views/partials/max_server_speed.ejs
 delete mode 100644 admportal/views/partials/metroroadm_service_request.ejs
 delete mode 100644 admportal/views/partials/nat.ejs
 delete mode 100644 admportal/views/partials/nb_vlan_pool.ejs
 delete mode 100644 admportal/views/partials/nb_vlan_range.ejs
 delete mode 100644 admportal/views/partials/ncs_credentials.ejs
 delete mode 100644 admportal/views/partials/network_connections.ejs
 delete mode 100644 admportal/views/partials/network_profile.ejs
 delete mode 100644 admportal/views/partials/new_parameter.ejs
 delete mode 100644 admportal/views/partials/newuserform.ejs
 delete mode 100644 admportal/views/partials/oper_status_modal.ejs
 delete mode 100644 admportal/views/partials/owbc_properties.ejs
 delete mode 100644 admportal/views/partials/partner_properties.ejs
 delete mode 100644 admportal/views/partials/pat.ejs
 delete mode 100644 admportal/views/partials/pat_pools.ejs
 delete mode 100644 admportal/views/partials/phs_credentials.ejs
 delete mode 100644 admportal/views/partials/request_information_modal.ejs
 delete mode 100644 admportal/views/partials/resource_rule.ejs
 delete mode 100644 admportal/views/partials/ro_header.ejs
 delete mode 100644 admportal/views/partials/roadm_mapping.ejs
 delete mode 100644 admportal/views/partials/router_master.ejs
 delete mode 100644 admportal/views/partials/routing_protocol.ejs
 delete mode 100644 admportal/views/partials/sdnc_request_header_modal.ejs
 delete mode 100644 admportal/views/partials/sdnfcHeader.ejs
 delete mode 100644 admportal/views/partials/sdnmlcHeader.ejs
 delete mode 100644 admportal/views/partials/service_information_modal.ejs
 delete mode 100644 admportal/views/partials/service_manager_credentials.ejs
 delete mode 100644 admportal/views/partials/service_status_modal.ejs
 delete mode 100755 admportal/views/partials/startssl.sh
 delete mode 100644 admportal/views/partials/svc_config_additional_data.ejs
 delete mode 100644 admportal/views/partials/svc_topology_additional_data_modal.ejs
 delete mode 100644 admportal/views/partials/t_provided_v4_lan_public_prefixes.ejs
 delete mode 100644 admportal/views/partials/t_provided_v6_lan_public_prefixes.ejs
 delete mode 100644 admportal/views/partials/tcp_port_list.ejs
 delete mode 100644 admportal/views/partials/threshold_alarm.ejs
 delete mode 100644 admportal/views/partials/udp_port_list.ejs
 delete mode 100644 admportal/views/partials/update_aic_avail_zone.ejs
 delete mode 100644 admportal/views/partials/update_aic_site.ejs
 delete mode 100644 admportal/views/partials/update_aic_switch.ejs
 delete mode 100644 admportal/views/partials/update_max_port_speed.ejs
 delete mode 100644 admportal/views/partials/update_parameter.ejs
 delete mode 100644 admportal/views/partials/update_resource_rule.ejs
 delete mode 100644 admportal/views/partials/update_service_homing.ejs
 delete mode 100644 admportal/views/partials/update_vlan_id_pool.ejs
 delete mode 100644 admportal/views/partials/update_vpe_pool.ejs
 delete mode 100644 admportal/views/partials/update_vplspe_pool.ejs
 delete mode 100644 admportal/views/partials/userform.ejs
 delete mode 100644 admportal/views/partials/v4_dhcp_pools.ejs
 delete mode 100644 admportal/views/partials/v4_firewall_packet_filters.ejs
 delete mode 100644 admportal/views/partials/v4_nat_mapping_entries.ejs
 delete mode 100644 admportal/views/partials/v4_static_routes.ejs
 delete mode 100644 admportal/views/partials/v6_dhcp_pools.ejs
 delete mode 100644 admportal/views/partials/v6_firewall_packet_filters.ejs
 delete mode 100644 admportal/views/partials/v6_static_routes.ejs
 delete mode 100644 admportal/views/partials/vlan.ejs
 delete mode 100644 admportal/views/partials/vm_networks.ejs
 delete mode 100644 admportal/views/partials/vm_profile.ejs
 delete mode 100644 admportal/views/partials/vnf_network.ejs
 delete mode 100644 admportal/views/partials/vnf_profile.ejs
 delete mode 100644 admportal/views/partials/vnf_vm_information.ejs
 delete mode 100644 admportal/views/partials/vr_lan_interface.ejs
 delete mode 100644 admportal/views/partials/vrr_credentials.ejs

(limited to 'admportal/views/partials')

diff --git a/admportal/views/partials/add_service_homing.ejs b/admportal/views/partials/add_service_homing.ejs
deleted file mode 100644
index 4a75125a..00000000
--- a/admportal/views/partials/add_service_homing.ejs
+++ /dev/null
@@ -1,52 +0,0 @@
-   <div class="modal fade" id="add_service_homing" tabindex="-1" role="dialog" 
-		aria-labelledby="add_service_homing_label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Add Service Homing</h4>
-          </div>
-          <div class="modal-body">
-            <form name="addForm" role="form" action="/gamma/addServiceHoming" method="POST">
-              <div class="form-group">
-                <label for="nf_service_type">*Service Type</label>
-                <input readonly type="text" class="form-control" name="nf_service_type" id="nf_service_type" value="SDN-ETHERNET-INTERNET">
-              </div>
-              <div class="form-group">
-                <label for="nf_lata">*LATA</label>
-                <input type="text" class="form-control" name="nf_lata" id="nf_lata" maxlength="12" placeholder="int(3)">
-              </div>
-              <div class="form-group">
-                <label for="nf_hubbing_city_type">*Hubbing City Type</label>
-                <input maxlength="40" type="text" class="form-control" name="nf_hubbing_city_type" id="nf_hubbing_city_type" placeholder="varchar(40)">
-              </div>
-              <div class="form-group">
-                <label for="nf_latitude">Latitude</label>
-                <input type="text" class="form-control" name="nf_latitude" id="nf_latitude" maxlength="24" placeholder="float">
-              </div>
-              <div class="form-group">
-                <label for="nf_longitude">Longitude</label>
-                <input type="text" class="form-control" name="nf_longitude" id="nf_longitude" maxlength="24" placeholder="float">
-			  </div>
-              <div class="form-group">
-                <label for="nf_primary_aic_site_name">*Primary Site Name</label>
-                <input maxlength="100" type="text" class="form-control" name="nf_primary_aic_site_name" id="nf_primary_aic_site_name" placeholder="varchar(100)">
-			  </div>
-              <div class="form-group">
-                <label for="nf_secondary_aic_site_name">Secondary Site Name</label>
-                <input maxlength="100" type="text" class="form-control" name="nf_secondary_aic_site_name" id="nf_secondary_aic_site_name" placeholder="varchar(100)">
-              </div>
-              <div class="form-group">
-                <label for="nf_tertiary_aic_site_name">Tertiary Site Name</label>
-                <input maxlength="100" type="text" class="form-control" name="nf_tertiary_aic_site_name" id="nf_tertiary_aic_site_name" placeholder="varchar(100)">
-              </div>
-              <div class="form-group">
-				<input type="hidden" name="nf_action" id="nf_action">
-				<button type="button" class="btn btn-primary" onclick="submitServiceHoming(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
diff --git a/admportal/views/partials/alts_credentials.ejs b/admportal/views/partials/alts_credentials.ejs
deleted file mode 100644
index 6d5f113c..00000000
--- a/admportal/views/partials/alts_credentials.ejs
+++ /dev/null
@@ -1,65 +0,0 @@
-<div class="modal fade" id="add_alts_credentials" tabindex="-1" role="dialog"
-        aria-labelledby="add_alts_credentials_label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Add ALTS Credentials</h4>
-          </div>
-          <div class="modal-body">
-            <form name="addForm" role="form" action="/ucpe/addAltsCredentials" method="POST">
-              <div class="form-group">
-                <label for="nf_alts_username">*ALTS Username</label>
-                <input type="text" class="form-control" maxlength="255" name="nf_alts_username" id="nf_alts_username" placeholder="varchar(255)">
-              </div>
-              <div class="form-group">
-                <label for="nf_alts_password">*ALTS Password</label>
-                <input type="password" class="form-control" maxlength="255" name="nf_alts_password" id="nf_alts_password" placeholder="varbinary(255)">
-              </div>
-              <div class="form-group">
-                <label for="nf_alts_password">*Confirm ALTS Password</label>
-                <input type="password" class="form-control" maxlength="255" name="nf_confirm_alts_password" id="nf_confirm_alts_password" placeholder="varbinary(255)">
-              </div>
-              <div class="form-group">
-                <input type="hidden" name="nf_action" id="nf_action">
-                <button type="button" class="btn btn-primary" onclick="submitAltsCredentials(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-   <div class="modal fade" id="update_alts_credentials" tabindex="-1" role="dialog" 
-		aria-labelledby="update_alts_credentials_label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Update ALTS Credentials</h4>
-          </div>
-          <div class="modal-body">
-            <form role="form" action="/ucpe/updateAltsCredentials" method="POST">
-              <div class="form-group">
-                <label for="uf_alts_username">*ALTS Username</label>
-                <input type="text" class="form-control" maxlength="255" name="uf_alts_username" id="uf_alts_username">
-              </div>
-              <div class="form-group">
-                <label for="uf_alts_password">*ALTS Password</label>
-                <input type="password" class="form-control" maxlength="255" name="uf_alts_password" id="uf_alts_password">
-			  </div>
-              <div class="form-group">
-                <label for="uf_alts_password">*Confirm ALTS Password</label>
-                <input type="password" class="form-control" maxlength="255" name="uf_confirm_alts_password" id="uf_confirm_alts_password" placeholder="varbinary(255)">
-              </div>
-              <div class="form-group">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submitAltsCredentials(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
diff --git a/admportal/views/partials/dhcp.ejs b/admportal/views/partials/dhcp.ejs
deleted file mode 100644
index a290c324..00000000
--- a/admportal/views/partials/dhcp.ejs
+++ /dev/null
@@ -1,66 +0,0 @@
-   <div class="modal fade" id="dhcp-modal" tabindex="-1" role="dialog" 
-		aria-labelledby="dhcp-modal-label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">dhcp</h4>
-          </div>
-          <div class="modal-body">
-            <form id="dhcp_form" role="form" action="" method="POST">
-              <div class="form-group">
-                <label for="use_v4_default_pool">use-v4-default-pool</label>
-                <input type="text" class="form-control" name="use_v4_default_pool" id="use_v4_default_pool">
-              </div>
-              <div class="form-group">
-                <label for="use_v6_default_pool">use-v6-default-pool</label>
-                <input type="text" class="form-control" name="use_v6_default_pool" id="use_v6_default_pool">
-              </div>
-              <div class="form-group">
-                <label for="v4_dhcp_server_enabled">v4-dhcp-server-enabled</label>
-                <input type="text" class="form-control" name="v4_dhcp_server_enabled" id="v4_dhcp_server_enabled">
-              </div>
-              <div class="form-group">
-                <label for="v6_dhcp_server_enabled">v6-dhcp-server-enabled</label>
-                <input type="text" class="form-control" name="v6_dhcp_server_enabled" id="v6_dhcp_server_enabled">
-              </div>
-              <div class="form-group">
-                <label for="v6_dhcp_default_pool_prefix">v6-dhcp-default-pool-prefix</label>
-                <input type="text" class="form-control" name="v6_dhcp_default_pool_prefix" id="v6_dhcp_default_pool_prefix">
-              </div>
-              <div class="form-group">
-                <label for="v6_dhcp_default_pool_prefix_length">v6-dhcp-default-pool-prefix-length</label>
-                <input type="text" class="form-control" name="v6_dhcp_default_pool_prefix_length" id="v6_dhcp_default_pool_prefix_length">
-              </div>
-              <div class="form-group">
-                <label for="v4_dhcp_default_pool_prefix">v4-dhcp-default-pool-prefix</label>
-                <input type="text" class="form-control" name="v4_dhcp_default_pool_prefix" id="v4_dhcp_default_pool_prefix">
-              </div>
-              <div class="form-group">
-                <label for="v4_dhcp_default_pool_prefix_length">v4-dhcp-default-pool-prefix-length</label>
-                <input type="text" class="form-control" name="v4_dhcp_default_pool_prefix_length" id="v4_dhcp_default_pool_prefix_length">
-              </div>
-
-<!--
-              <div class="form-group">
-				<input type="hidden" name="svc_instance_id" id="svc_instance_id">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submit(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
--->
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-<script type="text/javascript">
-function submit(form){
-	$('#dhcp-modal').modal('hide');
-	form.action = form.uf_action.value;
-	form.submit();
-	return;
-}
-</script>
-
diff --git a/admportal/views/partials/env.ejs b/admportal/views/partials/env.ejs
deleted file mode 100644
index 249a707a..00000000
--- a/admportal/views/partials/env.ejs
+++ /dev/null
@@ -1 +0,0 @@
--dev
diff --git a/admportal/views/partials/equipment.ejs b/admportal/views/partials/equipment.ejs
deleted file mode 100644
index 5f4d798d..00000000
--- a/admportal/views/partials/equipment.ejs
+++ /dev/null
@@ -1,58 +0,0 @@
-   <div class="modal fade" 
-		id="equipment-modal" tabindex="-1" role="dialog" 
-		aria-labelledby="equipment-modal-label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">equipment</h4>
-          </div>
-          <div class="modal-body">
-            <form role="form" action="" method="POST">
-              <div class="form-group">
-                <label for="equipment_role">equipment-role</label>
-                <input type="text" class="form-control" name="equipment_role" id="equipment_role">
-              </div>
-              <div class="form-group">
-                <label for="ptnii_name">ptnii-name</label>
-                <input type="text" class="form-control" name="ptnii_name" id="ptnii_name">
-              </div>
-              <div class="form-group">
-                <label for="ipv4_oam_address">ipv4-oam-address</label>
-                <input type="text" class="form-control" name="ipv4_oam_address" id="ipv4_oam_address">
-              </div>
-              <div class="form-group">
-                <label for="ipv4_oam_gateway_address">ipv4-oam-gateway-address</label>
-                <input type="text" class="form-control" name="ipv4_oam_gateway_address" id="ipv4_oam_gateway_address">
-              </div>
-              <div class="form-group">
-                <label for="v4_loopback0_ip_address">v4-loopback0-ip-address</label>
-                <input type="text" class="form-control" name="v4_loopback0_ip_address" id="v4_loopback0_ip_address">
-              </div>
-              <div class="form-group">
-                <label for="ipv4_oam_gateway_address_prefix_length">ipv4-oam-gateway-address-prefix-length</label>
-                <input type="text" class="form-control" name="ipv4_oam_gateway_address_prefix_length" id="ipv4_oam_gateway_address_prefix_length">
-              </div>
-
-<!--
-              <div class="form-group">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submit(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
--->
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-<script type="text/javascript">
-function submit(form){
-	$('#equipment-modal').modal('hide');
-	form.action = form.uf_action.value;
-	form.submit();
-	return;
-}
-</script>
-
diff --git a/admportal/views/partials/excluded_v4_address.ejs b/admportal/views/partials/excluded_v4_address.ejs
deleted file mode 100644
index e74d3245..00000000
--- a/admportal/views/partials/excluded_v4_address.ejs
+++ /dev/null
@@ -1,38 +0,0 @@
-   <div class="modal fade" id="excluded-v4-address-modal" tabindex="-1" role="dialog" 
-		aria-labelledby="excluded-v4-address-modal-label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">dhcp</h4>
-          </div>
-          <div class="modal-body">
-            <form role="form" action="" method="POST">
-              <div class="form-group">
-                <label for="exclded_v4_address">exclded-v4-address</label>
-                <input type="text" class="form-control" name="exclded_v4_address" id="exclded_v4_address">
-              </div>
-
-<!--
-              <div class="form-group">
-				<input type="hidden" name="svc_instance_id" id="svc_instance_id">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submit(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
--->
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-<script type="text/javascript">
-function submit(form){
-	$('#excluded-v4-address-modal').modal('hide');
-	form.action = form.uf_action.value;
-	form.submit();
-	return;
-}
-</script>
-
diff --git a/admportal/views/partials/excluded_v4_address_from_default_pool.ejs b/admportal/views/partials/excluded_v4_address_from_default_pool.ejs
deleted file mode 100644
index 442fd344..00000000
--- a/admportal/views/partials/excluded_v4_address_from_default_pool.ejs
+++ /dev/null
@@ -1,38 +0,0 @@
-   <div class="modal fade" id="excluded-v4-address-from-default-pool-modal" tabindex="-1" role="dialog" 
-		aria-labelledby="excluded-v4-address-from-default-pool-modal-label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">excluded-v4-addresses-from-default-pool</h4>
-          </div>
-          <div class="modal-body">
-            <form role="form" action="" method="POST">
-              <div class="form-group">
-                <label for="excluded_v4_address_from_default_pool">excluded-v4-address</label>
-                <input type="text" class="form-control" name="excluded_v4_address_from_default_pool" id="excluded_v4_address_from_default_pool">
-              </div>
-
-<!--
-              <div class="form-group">
-				<input type="hidden" name="svc_instance_id" id="svc_instance_id">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submit(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
--->
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-<script type="text/javascript">
-function submit(form){
-	$('#excluded-v4-address-from-default-pool-modal').modal('hide');
-	form.action = form.uf_action.value;
-	form.submit();
-	return;
-}
-</script>
-
diff --git a/admportal/views/partials/excluded_v6_address_from_default_pool.ejs b/admportal/views/partials/excluded_v6_address_from_default_pool.ejs
deleted file mode 100644
index a91d0a75..00000000
--- a/admportal/views/partials/excluded_v6_address_from_default_pool.ejs
+++ /dev/null
@@ -1,38 +0,0 @@
-   <div class="modal fade" id="excluded-v6-address-from-default-pool-modal" tabindex="-1" role="dialog" 
-		aria-labelledby="excluded-v6-address-from-default-pool-modal-label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">excluded-v6-addresses-from-default-pool</h4>
-          </div>
-          <div class="modal-body">
-            <form role="form" action="" method="POST">
-              <div class="form-group">
-                <label for="excluded_v6_address_from_default_pool">excluded-v6-address</label>
-                <input type="text" class="form-control" name="excluded_v6_address_from_default_pool" id="excluded_v6_address_from_default_pool">
-              </div>
-
-<!--
-              <div class="form-group">
-				<input type="hidden" name="svc_instance_id" id="svc_instance_id">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submit(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
--->
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-<script type="text/javascript">
-function submit(form){
-	$('#excluded-v6-address-from-default-pool-modal').modal('hide');
-	form.action = form.uf_action.value;
-	form.submit();
-	return;
-}
-</script>
-
diff --git a/admportal/views/partials/excluded_v6_addresses.ejs b/admportal/views/partials/excluded_v6_addresses.ejs
deleted file mode 100644
index d155383e..00000000
--- a/admportal/views/partials/excluded_v6_addresses.ejs
+++ /dev/null
@@ -1,38 +0,0 @@
-   <div class="modal fade" id="excluded-v6-addresses-modal" tabindex="-1" role="dialog" 
-		aria-labelledby="excluded-v6-addresses-modal-label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">excluded-v6-addresses</h4>
-          </div>
-          <div class="modal-body">
-            <form role="form" action="" method="POST">
-              <div class="form-group">
-                <label for="excluded_v6_address">excluded-v6-address</label>
-                <input type="text" class="form-control" name="excluded_v6_address" id="excluded_v6_address">
-              </div>
-
-<!--
-              <div class="form-group">
-				<input type="hidden" name="svc_instance_id" id="svc_instance_id">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submit(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
--->
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-<script type="text/javascript">
-function submit(form){
-	$('#excluded-v6-addresses-modal').modal('hide');
-	form.action = form.uf_action.value;
-	form.submit();
-	return;
-}
-</script>
-
diff --git a/admportal/views/partials/feature_list.ejs b/admportal/views/partials/feature_list.ejs
deleted file mode 100644
index 95ebf872..00000000
--- a/admportal/views/partials/feature_list.ejs
+++ /dev/null
@@ -1,50 +0,0 @@
-   <div class="modal fade" 
-		id="feature-list-modal" tabindex="-1" role="dialog" 
-		aria-labelledby="feature-list-modal-label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">feature-list</h4>
-          </div>
-          <div class="modal-body">
-            <form role="form" action="" method="POST">
-              <div class="form-group">
-                <label for="feature_instance_id">feature-instance-id</label>
-                <input type="text" class="form-control" name="feature_instance_id" id="feature_instance_id">
-              </div>
-              <div class="form-group">
-                <label for="feature_instance_xpath">feature-instance-xpath</label>
-                <input type="text" class="form-control" name="feature_instance_xpath" id="feature_instance_xpath">
-              </div>
-              <div class="form-group">
-                <label for="feature_sub_type">feature-sub-type</label>
-                <input type="text" class="form-control" name="feature_sub_type" id="feature_sub_type">
-              </div>
-              <div class="form-group">
-                <label for="feature_type">feature-type</label>
-                <input type="text" class="form-control" name="feature_type" id="feature_type">
-              </div>
-
-<!--
-              <div class="form-group">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submit(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
--->
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-<script type="text/javascript">
-function submit(form){
-	$('#feature-list-modal').modal('hide');
-	form.action = form.uf_action.value;
-	form.submit();
-	return;
-}
-</script>
-
diff --git a/admportal/views/partials/firewall_lite.ejs b/admportal/views/partials/firewall_lite.ejs
deleted file mode 100644
index b26d078d..00000000
--- a/admportal/views/partials/firewall_lite.ejs
+++ /dev/null
@@ -1,43 +0,0 @@
-   <div class="modal fade" id="firewall-lite-modal" tabindex="-1" role="dialog" 
-		aria-labelledby="firewall-lite-modal-label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">firewall-lite</h4>
-          </div>
-          <div class="modal-body">
-            <form id="firewall_lite_form" role="form" action="" method="POST">
-              <div class="form-group">
-                <label for="stateful_firewall_lite_v4_enabled">stateful-firewall-lite-v4-enabled</label>
-                <input type="text" class="form-control" name="stateful_firewall_lite_v4_enabled" id="stateful_firewall_lite_v4_enabled">
-              </div>
-              <div class="form-group">
-                <label for="stateful_firewall_lite_v6_enabled">stateful-firewall-lite-v6-enabled</label>
-                <input type="text" class="form-control" name="stateful_firewall_lite_v6_enabled" id="stateful_firewall_lite_v6_enabled">
-              </div>
-
-<!--
-              <div class="form-group">
-				<input type="hidden" name="svc_instance_id" id="svc_instance_id">
-				<input type="hidden" name="firewall_lite_vr_designation" id="firewall_lite_vr_designation">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submit(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
--->
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-<script type="text/javascript">
-function submit(form){
-	$('#firewall-lite-modal').modal('hide');
-	form.action = form.uf_action.value;
-	form.submit();
-	return;
-}
-</script>
-
diff --git a/admportal/views/partials/footer.ejs b/admportal/views/partials/footer.ejs
deleted file mode 100644
index c04e26d4..00000000
--- a/admportal/views/partials/footer.ejs
+++ /dev/null
@@ -1,5 +0,0 @@
-
-<!-- views/partials/footer.ejs -->
-
-<p class="text-center text-muted">© Copyright 2017 AT&T Intellectual Property</p>
-
diff --git a/admportal/views/partials/form.ejs b/admportal/views/partials/form.ejs
deleted file mode 100644
index 00d3c0ce..00000000
--- a/admportal/views/partials/form.ejs
+++ /dev/null
@@ -1,55 +0,0 @@
-   <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title" id="myModalLabel">New Request</h4>
-          </div>
-          <div class="modal-body">
-            <form id="addEntry" role="form" action="svc-topology-operation">
-              <!--
-              <div class="form-group">
-                <label for="svc-request-id">svc-request-id</label>
-                <input type="text" class="form-control" name="svc-request-id" id="svc-request-id" value="req-0001">
-              </div>
-              -->
-              <div class="form-group">
-                <label for="svc-instance-id">svc-instance-id</label>
-                <input type="text" class="form-control" name="svc-instance-id" id="svc-instance-id" value="siid-0001">
-              </div>
-              <div class="form-group">
-                <label for="svc-vnf-type">svc-vnf-type</label>
-                <select class="form-control" name="svc-vnf-type" id="svc-vnf-type">
-                    <option value=vce>"vce"</option>
-                    <option value=Unknown>"Unknown"</option>
-                </select>
-              </div>
-              <div class="form-group">
-                <label for="svc-action">svc-action</label>
-                <select class="form-control" name="svc-action" id="svc-action">
-                    <option value=reserve>"reserve"</option>
-                    <option value=create>"create"</option>
-                    <option value=activate>"activate"</option>
-                    <option value=query>"query"</option>
-                    <option value=update>"update"</option>
-                    <option value=delete>"delete"</option>
-                </select>
-              </div>
-              <div class="form-group">
-                <label for="svc-notification-url">svc-notification-url</label>
-                <input type="text" class="form-control" name="svc-notification-url" id="svc-notification-url" value="">
-              </div>
-              <div class="form-group">
-                <label for="desc">svc-aic-site-id</label>
-                <input type="text" class="form-control" name="svc-aic-site-id" id="svc-aic-site-id" value="att-0001">
-              </div>
-              <div class="form-group">
-                <button type="submit" class="btn btn-primary">Save</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
diff --git a/admportal/views/partials/gammaHeader.ejs b/admportal/views/partials/gammaHeader.ejs
deleted file mode 100644
index 8af83963..00000000
--- a/admportal/views/partials/gammaHeader.ejs
+++ /dev/null
@@ -1,63 +0,0 @@
-
-<!-- views/partials/header.ejs -->
-<nav class="navbar navbar-default" role="navigation">
-    <div class="container-fluid">
-
-
-		<div class="navbar-header">
-			<a class="navbar-brand" href="#">&nbsp;AdminPortal</a>
-    	</div>
-
-        <div class="btn-toolbar" role="toolbar" aria-label="Toolbar with button groups">
-
-        <div class="btn-group" role="group">
-            <button type="button" class="btn btn-default navbar-btn "
-				onclick="location.assign('/sla/listSLA');">SLA</button>
-
-			<div class="btn-group" role="group">
-      			<button type="button" class="btn btn-default navbar-btn dropdown-toggle" 
-					data-toggle="dropdown" 
-					aria-expanded="false">Profiles <span class="caret"></span>
-				</button>
-      			<ul class="dropdown-menu" role="menu">
-        			<li><a href="/mobility/getVnfProfile">VNF Profile</a></li>
-				</ul>
-			</div>
-
-			<div class="btn-group" role="group">
-                <button type="button" class="btn btn-default navbar-btn dropdown-toggle"
-                    data-toggle="dropdown"
-                    aria-expanded="false">Preload Tools <span class="caret"></span>
-                </button>
-                <ul class="dropdown-menu" role="menu">
-        			<li><a href="/mobility/getVnfData">Pre-load VNF Data</a></li>
-        			<li><a href="/mobility/getVnfNetworkData">Pre-load VNF Network Data</a></li>
-                </ul>
-            </div>
-
-			<!-- LOGS
-			<div class="btn-group" role="group">
-      			<button type="button" class="btn btn-default navbar-btn dropdown-toggle" 
-					data-toggle="dropdown" 
-					aria-expanded="false">Logs  <span class="caret"></span></button>
-      			<ul class="dropdown-menu" role="menu">
-        			<li><a href="/logs/getUserTrace">User Trace</a></li>
-        			<li><a href="/logs/getAccessLog">Access Log</a></li>
-				</ul>
-			</div>
-			-->
-
-            <button type="button" class="btn btn-default navbar-btn"
-				onclick="location.assign('/user/listUsers');">User Admin</button>
-            <button type="button" class="btn btn-default navbar-btn"
-				onclick="location.assign('/logout');">Logout</button>
-        </div>
-        </div>
-    </div>
-
-</nav>
-
-<script type="text/javascript">
-$('[data-submenu]').submenupicker();
-$('[vlanidpool-submenu]').submenupicker();
-</script>
diff --git a/admportal/views/partials/head.ejs b/admportal/views/partials/head.ejs
deleted file mode 100644
index 066bf3c6..00000000
--- a/admportal/views/partials/head.ejs
+++ /dev/null
@@ -1,20 +0,0 @@
-<!-- Latest compiled and minified CSS -->
-<link rel="stylesheet" href="/stylesheets/bootstrap.min.css">
-<link rel="stylesheet" href="/stylesheets/bootstrap-theme.min.css">
-<link rel="stylesheet" href="/stylesheets/dataTables.bootstrap.min.css">
-<!-- <link rel="stylesheet" href="/stylesheets/bootstrap-table.css"> -->
-<link rel="stylesheet" href="/stylesheets/bootstrap-submenu.min.css">
-<link rel="stylesheet" href="/stylesheets/jquery.treegrid.css">
-
-<!-- jquery downloaded from jquery.com/download -->
-<!-- <script src="/javascripts/jquery.min.js"></script> -->
-<script src="/javascripts/jquery-2.2.0.min.js"></script>
-<script src="/javascripts/jquery.dataTables.min.js"></script>
-<script src="/javascripts/jquery.treegrid.js"></script>
-<script src="/javascripts/jquery.treegrid.bootstrap3.js"></script>
-<script src="/javascripts/bootstrap.min.js"></script>
-<!-- <script src="/javascripts/bootstrap-table.js"></script> -->
-<script src="/javascripts/bootstrap-submenu.min.js"></script>
-<script src="/javascripts/bootbox.min.js"></script>
-<script src="/javascripts/dataTables.bootstrap.min.js"></script>
-
diff --git a/admportal/views/partials/head.ejs.orig b/admportal/views/partials/head.ejs.orig
deleted file mode 100644
index 2f6f537e..00000000
--- a/admportal/views/partials/head.ejs.orig
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML>
-<meta charset="UTF-8">
-<title>SDN-C AdminPortal</title>
-
-<!-- Latest compiled and minified CSS -->
-<link rel="stylesheet" href="/stylesheets/bootstrap.min.css">
-
-<!-- Optional theme -->
-<link rel="stylesheet" href="/stylesheets/bootstrap-theme.min.css">
-<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-<script src="/javascripts/jquery.min.js"></script>
-<!-- Latest compiled and minified JavaScript -->
-<script src="/javascripts/bootstrap.min.js"></script>
diff --git a/admportal/views/partials/header.ejs b/admportal/views/partials/header.ejs
deleted file mode 100644
index 6342154d..00000000
--- a/admportal/views/partials/header.ejs
+++ /dev/null
@@ -1,11 +0,0 @@
-<% if (header == 'gamma') { %>
-  <% include ../partials/gammaHeader %>
-<% } else if(header == 'sdn-mlc'){ %>
-  <% include ../partials/sdnmlcHeader %>
-<% } else if(header == 'sdn-fc'){ %>
-  <% include ../partials/sdnfcHeader %>
-<% } else { %>
-  <% include ../partials/gammaHeader %>
-<% } %>
-
-
diff --git a/admportal/views/partials/header.ejs.orig b/admportal/views/partials/header.ejs.orig
deleted file mode 100644
index 830bd275..00000000
--- a/admportal/views/partials/header.ejs.orig
+++ /dev/null
@@ -1,55 +0,0 @@
-<!-- views/partials/header.ejs -->
-<nav class="navbar navbar-default" role="navigation">
-    <div class="container-fluid">
-
-		<div class="navbar-header">
-            <a class="navbar-brand" href="#">&nbsp;SDN-C AdminPortal</a>
-        </div>
-
-        <div class="btn-toolbar" role="toolbar" aria-label="Toolbar with button groups">
-
-        <div class="btn-group" role="group">
-            <button type="button" class="btn btn-default navbar-btn"
-				onclick="location.assign('/sla/listSLA');">SLA</button>
-
-<div class="btn-group">
-      <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">Default <span class="caret"></span></button>
-      <ul class="dropdown-menu" role="menu">
-        <li><a href="#">Action</a></li>
-        <li><a href="#">Another action</a></li>
-        <li><a href="#">Something else here</a></li>
-        <li class="divider"></li>
-        <li><a href="#">Separated link</a></li>
-      </ul>
-    </div>
-
-            <button type="button" class="btn btn-default navbar-btn">Interfaces</button>
-            <button type="button" class="btn btn-default navbar-btn">VMs</button>
-            <button type="button" class="btn btn-default navbar-btn"
-				onclick="location.assign('/odl/listWklst');">Worklist Orders</button>
-            <button type="button" class="btn btn-default navbar-btn">Connections</button>
-            <button type="button" class="btn btn-default navbar-btn">VNFs</button>
-            <button type="button" class="btn btn-default navbar-btn">VLANs</button>
-            <button type="button" class="btn btn-default navbar-btn"
-				onclick="location.assign('/user/listUsers');">User Admin</button>
-            <button type="button" class="btn btn-default navbar-btn navbar-btn"
-				onclick="location.assign('/logout');">Logout</button>
-			<!-- <p class="btn-toolbar" role="group">ar3165 | Al Rotundo</p> -->
-        </div>
-        </div>
-    </div>
-</nav>
-
-<!-- Single button -->
-<div class="btn-group">
-  <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
-    Action <span class="caret"></span>
-  </button>
-  <ul class="dropdown-menu" role="menu">
-    <li><a href="#">Action</a></li>
-    <li><a href="#">Another action</a></li>
-    <li><a href="#">Something else here</a></li>
-    <li class="divider"></li>
-    <li><a href="#">Separated link</a></li>
-  </ul>
-</div>
diff --git a/admportal/views/partials/interface.ejs b/admportal/views/partials/interface.ejs
deleted file mode 100644
index c8afce9c..00000000
--- a/admportal/views/partials/interface.ejs
+++ /dev/null
@@ -1,42 +0,0 @@
-   <div class="modal fade" 
-		id="interface-modal" tabindex="-1" role="dialog" 
-		aria-labelledby="interface-modal-label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">interface</h4>
-          </div>
-          <div class="modal-body">
-            <form role="form" action="" method="POST">
-              <div class="form-group">
-                <label for="interface_name">interface-name</label>
-                <input type="text" class="form-control" name="interface_name" id="interface_name">
-              </div>
-              <div class="form-group">
-                <label for="interface_role">interface_role</label>
-                <input type="text" class="form-control" name="interface_role" id="interface_role">
-              </div>
-
-<!--
-              <div class="form-group">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submit(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
--->
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-<script type="text/javascript">
-function submit(form){
-	$('#interface-modal').modal('hide');
-	form.action = form.uf_action.value;
-	form.submit();
-	return;
-}
-</script>
-
diff --git a/admportal/views/partials/internet_evc_modal.ejs b/admportal/views/partials/internet_evc_modal.ejs
deleted file mode 100644
index 70848bad..00000000
--- a/admportal/views/partials/internet_evc_modal.ejs
+++ /dev/null
@@ -1,44 +0,0 @@
-   <div class="modal fade" id="internet-evc-modal" tabindex="-1" role="dialog" aria-labelledby="internet-evc-modal-label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title" id="internet-evc-modal-label">Internet EVC Access Information</h4>
-          </div>
-          <div class="modal-body">
-            <form id="internet_evc_form" role="form" action="" method="POST">
-              <div class="form-group">
-                <label for="ip_version">ip-version</label>
-                <input type="text" class="form-control" name="ip_version" id="ip_version">
-              </div>
-              <div class="form-group">
-                <label for="internet_evc_speed_value">internet-evc-speed-value</label>
-                <input type="text" class="form-control" name="internet_evc_speed_value" id="internet_evc_speed_value">
-              </div>
-              <div class="form-group">
-                <label for="internet_evc_speed_units">internet-evc-speed-units</label>
-                <input type="text" class="form-control" name="internet_evc_speed_units" id="internet_evc_speed_units">
-              </div>
-
-<!--
-              <div class="form-group">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submit(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
--->
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-<script type="text/javascript">
-function submit(form){
-	$('#service-status-modal').modal('hide');
-	form.action = form.uf_action.value;
-	form.submit();
-	return;
-}
-</script>
-
diff --git a/admportal/views/partials/ipv4_infrastructure_static_route.ejs b/admportal/views/partials/ipv4_infrastructure_static_route.ejs
deleted file mode 100644
index b9b92089..00000000
--- a/admportal/views/partials/ipv4_infrastructure_static_route.ejs
+++ /dev/null
@@ -1,50 +0,0 @@
-   <div class="modal fade" 
-		id="ipv4-infrastructure-static-route-modal" tabindex="-1" role="dialog" 
-		aria-labelledby="ipv4-infrastructure-static-route-modal-label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">ipv4-infrastructure-static-route</h4>
-          </div>
-          <div class="modal-body">
-            <form role="form" action="" method="POST">
-              <div class="form-group">
-                <label for="ipv4_outgoing_interface">ipv4-outgoing-interface</label>
-                <input type="text" class="form-control" name="ipv4_outgoing_interface" id="ipv4_outgoing_interface">
-              </div>
-              <div class="form-group">
-                <label for="ipv4_next_hop_address">ipv4-next-hop-address</label>
-                <input type="text" class="form-control" name="ipv4_next_hop_address" id="ipv4_next_hop_address">
-              </div>
-              <div class="form-group">
-                <label for="ipv4_dest_prefix">ipv4-dest-prefix</label>
-                <input type="text" class="form-control" name="ipv4_dest_prefix" id="ipv4_dest_prefix">
-              </div>
-              <div class="form-group">
-                <label for="ipv4_dest_prefix_length">ipv4-dest-prefix-length</label>
-                <input type="text" class="form-control" name="ipv4_dest_prefix_length" id="ipv4_dest_prefix_length">
-              </div>
-
-<!--
-              <div class="form-group">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submit(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
--->
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-<script type="text/javascript">
-function submit(form){
-	$('#ipv4-infrastructure-static-route-modal').modal('hide');
-	form.action = form.uf_action.value;
-	form.submit();
-	return;
-}
-</script>
-
diff --git a/admportal/views/partials/ipv6_infrastructure_static_route.ejs b/admportal/views/partials/ipv6_infrastructure_static_route.ejs
deleted file mode 100644
index 4921e2ea..00000000
--- a/admportal/views/partials/ipv6_infrastructure_static_route.ejs
+++ /dev/null
@@ -1,50 +0,0 @@
-   <div class="modal fade" 
-		id="ipv6-infrastructure-static-route-modal" tabindex="-1" role="dialog" 
-		aria-labelledby="ipv6-infrastructure-static-route-modal-label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">ipv6-infrastructure-static-route</h4>
-          </div>
-          <div class="modal-body">
-            <form role="form" action="" method="POST">
-              <div class="form-group">
-                <label for="ipv6_outgoing_interface">ipv6-outgoing-interface</label>
-                <input type="text" class="form-control" name="ipv6_outgoing_interface" id="ipv6_outgoing_interface">
-              </div>
-              <div class="form-group">
-                <label for="ipv6_next_hop_address">ipv6-next-hop-address</label>
-                <input type="text" class="form-control" name="ipv6_next_hop_address" id="ipv6_next_hop_address">
-              </div>
-              <div class="form-group">
-                <label for="ipv6_dest_prefix">ipv6-dest-prefix</label>
-                <input type="text" class="form-control" name="ipv6_dest_prefix" id="ipv6_dest_prefix">
-              </div>
-              <div class="form-group">
-                <label for="ipv6_dest_prefix_length">ipv6-dest-prefix-length</label>
-                <input type="text" class="form-control" name="ipv6_dest_prefix_length" id="ipv6_dest_prefix_length">
-              </div>
-
-<!--
-              <div class="form-group">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submit(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
--->
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-<script type="text/javascript">
-function submit(form){
-	$('#ipv6-infrastructure-static-route-modal').modal('hide');
-	form.action = form.uf_action.value;
-	form.submit();
-	return;
-}
-</script>
-
diff --git a/admportal/views/partials/l2_homing_information_modal.ejs b/admportal/views/partials/l2_homing_information_modal.ejs
deleted file mode 100644
index 03af0546..00000000
--- a/admportal/views/partials/l2_homing_information_modal.ejs
+++ /dev/null
@@ -1,46 +0,0 @@
-   <div class="modal fade" 
-		id="l2-homing-information-modal" tabindex="-1" role="dialog" 
-		aria-labelledby="l2-homing-information-modal-label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title" id="l2-homing-information-modal-label">l2-homing-information</h4>
-          </div>
-          <div class="modal-body">
-            <form id="l2_homing_information_form" role="form" action="" method="POST">
-              <div class="form-group">
-                <label for="evc_name">evc-name</label>
-                <input type="text" class="form-control" name="evc_name" id="evc_name">
-              </div>
-              <div class="form-group">
-                <label for="preferred_aic_clli">preferred-aic-clli</label>
-                <input type="text" class="form-control" name="preferred_aic_clli" id="preferred_aic_clli">
-              </div>
-              <div class="form-group">
-                <label for="topology">topology</label>
-                <input type="text" class="form-control" name="topology" id="topology">
-              </div>
-
-<!--
-              <div class="form-group">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submit(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
--->
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-<script type="text/javascript">
-function submit(form){
-	$('#service-status-modal').modal('hide');
-	form.action = form.uf_action.value;
-	form.submit();
-	return;
-}
-</script>
-
diff --git a/admportal/views/partials/l3_interface_ipv4_address_list.ejs b/admportal/views/partials/l3_interface_ipv4_address_list.ejs
deleted file mode 100644
index 50c66cd9..00000000
--- a/admportal/views/partials/l3_interface_ipv4_address_list.ejs
+++ /dev/null
@@ -1,42 +0,0 @@
-   <div class="modal fade" 
-		id="l3-interface-ipv4-address-list-modal" tabindex="-1" role="dialog" 
-		aria-labelledby="l3-interface-ipv4-address-list-modal-label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">l3-interface-ipv4-address-list</h4>
-          </div>
-          <div class="modal-body">
-            <form role="form" action="" method="POST">
-              <div class="form-group">
-                <label for="l3_interface_ipv4_address">l3-interface-ipv4-address</label>
-                <input type="text" class="form-control" name="l3_interface_ipv4_address" id="l3_interface_ipv4_address">
-              </div>
-              <div class="form-group">
-                <label for="l3_interface_ipv4_prefix_length">l3-interface-ipv4-prefix-length</label>
-                <input type="text" class="form-control" name="l3_interface_ipv4_prefix_length" id="l3_interface_ipv4_prefix_length">
-              </div>
-
-<!--
-              <div class="form-group">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submit(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
--->
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-<script type="text/javascript">
-function submit(form){
-	$('#l3-interface-ipv4-address-list-modal').modal('hide');
-	form.action = form.uf_action.value;
-	form.submit();
-	return;
-}
-</script>
-
diff --git a/admportal/views/partials/l3_interface_ipv6_address_list.ejs b/admportal/views/partials/l3_interface_ipv6_address_list.ejs
deleted file mode 100644
index 9faec4c0..00000000
--- a/admportal/views/partials/l3_interface_ipv6_address_list.ejs
+++ /dev/null
@@ -1,42 +0,0 @@
-   <div class="modal fade" 
-		id="l3-interface-ipv6-address-list-modal" tabindex="-1" role="dialog" 
-		aria-labelledby="l3-interface-ipv6-address-list-modal-label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">l3-interface-ipv6-address-list</h4>
-          </div>
-          <div class="modal-body">
-            <form role="form" action="" method="POST">
-              <div class="form-group">
-                <label for="l3_interface_ipv6_address">l3-interface-ipv6-address</label>
-                <input type="text" class="form-control" name="l3_interface_ipv6_address" id="l3_interface_ipv6_address">
-              </div>
-              <div class="form-group">
-                <label for="l3_interface_ipv6_prefix_length">l3-interface-ipv6-prefix-length</label>
-                <input type="text" class="form-control" name="l3_interface_ipv6_prefix_length" id="l3_interface_ipv6_prefix_length">
-              </div>
-
-<!--
-              <div class="form-group">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submit(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
--->
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-<script type="text/javascript">
-function submit(form){
-	$('#l3-interface-ipv6-address-list-modal').modal('hide');
-	form.action = form.uf_action.value;
-	form.submit();
-	return;
-}
-</script>
-
diff --git a/admportal/views/partials/l3sdn_vnf_fields.ejs b/admportal/views/partials/l3sdn_vnf_fields.ejs
deleted file mode 100644
index e3d842ef..00000000
--- a/admportal/views/partials/l3sdn_vnf_fields.ejs
+++ /dev/null
@@ -1,70 +0,0 @@
-   <div class="modal fade" 
-		id="l3sdn-vnf-fields-modal" tabindex="-1" role="dialog" 
-		aria-labelledby="l3sdn-vnf-fields-modal-label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">l3sdn-vnf-fields</h4>
-          </div>
-          <div class="modal-body">
-            <form role="form" action="" method="POST">
-              <div class="form-group">
-                <label for="availability_zone">availability_zone</label>
-                <input type="text" class="form-control" name="availability_zone" id="availability_zone">
-              </div>
-              <div class="form-group">
-                <label for="vnf_stack_id">vnf-stack-id</label>
-                <input type="text" class="form-control" name="vnf_stack_id" id="vnf_stack_id">
-              </div>
-              <div class="form-group">
-                <label for="vnf_name">vnf-name</label>
-                <input type="text" class="form-control" name="vnf_name" id="vnf_name">
-              </div>
-              <div class="form-group">
-                <label for="vnf_name2">vnf-name2</label>
-                <input type="text" class="form-control" name="vnf_name2" id="vnf_name2">
-              </div>
-              <div class="form-group">
-                <label for="vnf_type">vnf-type</label>
-                <input type="text" class="form-control" name="vnf_type" id="vnf_type">
-              </div>
-              <div class="form-group">
-                <label for="vnf_status">vnf-status</label>
-                <input type="text" class="form-control" name="vnf_status" id="vnf_status">
-              </div>
-              <div class="form-group">
-                <label for="vnf_id">vnf-id</label>
-                <input type="text" class="form-control" name="vnf_id" id="vnf_id">
-              </div>
-              <div class="form-group">
-                <label for="oam_network_name">oam-network-name</label>
-                <input type="text" class="form-control" name="oam_network_name" id="oam_network_name">
-              </div>
-              <div class="form-group">
-                <label for="aic_site_id">aic_site_id</label>
-                <input type="text" class="form-control" name="aic_site_id" id="aic_site_id">
-              </div>
-
-<!--
-              <div class="form-group">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submit(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
--->
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-<script type="text/javascript">
-function submit(form){
-	$('#l3sdn-vnf-fields-modal').modal('hide');
-	form.action = form.uf_action.value;
-	form.submit();
-	return;
-}
-</script>
-
diff --git a/admportal/views/partials/link_latency_master.ejs b/admportal/views/partials/link_latency_master.ejs
deleted file mode 100644
index 83e87f03..00000000
--- a/admportal/views/partials/link_latency_master.ejs
+++ /dev/null
@@ -1,100 +0,0 @@
-<div class="modal fade" id="add_link_latency_master" tabindex="-1" role="dialog"
-        aria-labelledby="add_link_latency_master_label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Add Link Latency Master</h4>
-          </div>
-          <div class="modal-body">
-            <form name="addForm" role="form" action="/tunnel/addLinkLatencyMaster" method="POST">
-              <div class="form-group">
-                <label for="nf_source_crs_name">*Source CRS Name</label>
-                <input type="text" class="form-control" maxlength="20" name="nf_source_crs_name" id="nf_source_crs_name" placeholder="varchar(20)">
-              </div>
-              <div class="form-group">
-                <label for="nf_destination_crs_name">*Destination CRS Name</label>
-                <input type="text" class="form-control" maxlength="20" name="nf_destination_crs_name" id="nf_destination_crs_name" placeholder="varchar(20)">
-              </div>
-              <div class="form-group">
-                <label for="nf_bundle_name">*Bundle Name</label>
-                <input type="text" class="form-control" maxlength="50" name="nf_bundle_name" id="nf_bundle_name" placeholder="varchar(50)">
-              </div>
-              <div class="form-group">
-                <label for="nf_latency">*Latency</label>
-                <input type="text" class="form-control" maxlength="10" name="nf_latency" id="nf_latency" placeholder="varchar(10)">
-              </div>
-              <div class="form-group">
-                <label for="nf_intra_inter_snrc">*Intra Inter SNRC</label>
-                <input type="text" class="form-control" maxlength="10" name="nf_intra_inter_snrc" id="nf_intra_inter_snrc" placeholder="varchar(10)">
-              </div>
-              <div class="form-group">
-                <label for="nf_final_latency">*Final Latency</label>
-                <input type="text" class="form-control" maxlength="10" name="nf_final_latency" id="nf_final_latency" placeholder="varchar(10)">
-              </div>
-              <div class="form-group">
-                <label for="nf_augmentable">*Augmentable</label>
-                <input type="text" class="form-control" maxlength="1" name="nf_augmentable" id="nf_augmentable" placeholder="varchar(1)">
-              </div>
-              <div class="form-group">
-                <input type="hidden" name="nf_action" id="nf_action">
-                <button type="button" class="btn btn-primary" onclick="submitLinkLatencyMaster(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-   <div class="modal fade" id="update_link_latency_master" tabindex="-1" role="dialog" 
-		aria-labelledby="update_link_latency_master_label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Update Link Latency Master</h4>
-          </div>
-          <div class="modal-body">
-            <form role="form" action="/tunnel/updateLinkLatencyMaster" method="POST">
-              <div class="form-group">
-                    <label for="uf_source_crs_name">*Source CRS Name</label>
-                    <input type="text" class="form-control" maxlength="20" name="uf_source_crs_name" id="uf_source_crs_name" placeholder="varchar(20)">
-              </div>
-              <div class="form-group">
-                <label for="uf_destination_crs_name">*Destination CRS Name</label>
-                <input type="text" class="form-control" maxlength="20" name="uf_destination_crs_name" id="uf_destination_crs_name" placeholder="varchar(20)">
-              </div>
-              <div class="form-group">
-                <label for="uf_bundle_name">*Bundle Name</label>
-                <input type="text" class="form-control" maxlength="50" name="uf_bundle_name" id="uf_bundle_name" placeholder="varchar(50)">
-              </div>
-              <div class="form-group">
-                <label for="uf_latency">*Latency</label>
-                <input type="text" class="form-control" maxlength="10" name="uf_latency" id="uf_latency" placeholder="varchar(10)">
-              </div>
-              <div class="form-group">
-                <label for="uf_intra_inter_snrc">*Intra Inter SNRC</label>
-                <input type="text" class="form-control" maxlength="10" name="uf_intra_inter_snrc" id="uf_intra_inter_snrc" placeholder="varchar(10)">
-              </div>
-              <div class="form-group">
-                <label for="uf_final_latency">*Final Latency</label>
-                <input type="text" class="form-control" maxlength="10" name="uf_final_latency" id="uf_final_latency" placeholder="varchar(10)">
-              </div>
-              <div class="form-group">
-                <label for="uf_augmentable">*Augmentable</label>
-                <input type="text" class="form-control" maxlength="1" name="uf_augmentable" id="uf_augmentable" placeholder="varchar(1)">
-              </div>
-              <div class="form-group">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <input type="hidden" name="uf_key_source_crs_name" id="uf_key_source_crs_name">
-                <input type="hidden" name="uf_key_destination_crs_name" id="uf_key_destination_crs_name">
-                <input type="hidden" name="uf_key_bundle_name" id="uf_key_bundle_name">
-                <button type="button" class="btn btn-primary" onclick="submitLinkLatencyMaster(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
diff --git a/admportal/views/partials/link_master.ejs b/admportal/views/partials/link_master.ejs
deleted file mode 100644
index 5ece82dd..00000000
--- a/admportal/views/partials/link_master.ejs
+++ /dev/null
@@ -1,109 +0,0 @@
-<div class="modal fade" id="add_link_master" tabindex="-1" role="dialog"
-                aria-labelledby="add_link_master_label" aria-hidden="true">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-          <h4 class="modal-title">Add Link Master</h4>
-      </div>
-      <div class="modal-body">
-      <form name="addForm" role="form" action="/tunnel/addLinkMaster" method="POST">
-          <div class="form-group">
-              <label for="nf_link_interface_ip">*Link Interface IP</label>
-              <input type="text" class="form-control" name="nf_link_interface_ip" id="nf_link_interface_ip" maxlength="20" placeholder="varchar(20)">
-          </div>
-          <div class="form-group">
-              <label for="nf_source_crs_name">*Source CRS Name</label>
-              <input type="text" class="form-control" name="nf_source_crs_name" id="nf_source_crs_name" maxlength="20" placeholder="varchar(20)">
-          </div>
-          <div class="form-group">
-              <label for="nf_destination_crs_name">*Destination CRS Name</label>
-              <input type="text" class="form-control" name="nf_destination_crs_name" id="nf_destination_crs_name" maxlength="20" placeholder="varchar(20)">
-          </div>
-          <div class="form-group">
-              <label for="nf_link_speed">Link Speed</label>
-              <input type="text" class="form-control" name="nf_link_speed" id="nf_link_speed" maxlength="11" placeholder="int(11)">
-          </div>
-          <div class="form-group">
-              <label for="nf_default_cost">Default Cost</label>
-              <input type="text" class="form-control" name="nf_default_cost" id="nf_default_cost" maxlength="11" placeholder="int(11)">
-          </div>
-          <div class="form-group">
-              <label for="nf_bundle_name">Bundle Name</label>
-              <input type="text" class="form-control" name="nf_bundle_name" id="nf_bundle_name" maxlength="20" placeholder="varchar(20)">
-          </div>
-          <div class="form-group">
-              <label for="nf_shutdown">Shutdown</label>
-              <select class="form-control" name="nf_shutdown" id="nf_shutdown">
-                    <option value='N'>False</option>
-                    <option value='Y'>True</option>
-              </select>
-          </div>
-
-          <div class="form-group">
-                <input type="hidden" name="nf_action" id="nf_action">
-                <button type="button" class="btn btn-primary" onclick="saveLinkMaster(this.form);">Save</button>
-                <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-          </div>
-       </form>
-       </div>
-    </div>
-  </div>
-</div>
-
-<div class="modal fade" id="update_link_master" tabindex="-1" role="dialog"
-        aria-labelledby="update_link_master_label" aria-hidden="true">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-          <h4 class="modal-title">Update Link Master</h4>
-      </div>
-      <div class="modal-body">
-      <form role="form" action="/tunnel/updateLinkMaster" method="POST">
-      <div class="form-group">
-          <label for="uf_link_interface_ip">*Link Interface IP</label>
-          <input type="text" class="form-control" name="uf_link_interface_ip" id="uf_link_interface_ip" maxlength="20" placeholder="varchar(20)">
-      </div>
-      <div class="form-group">
-          <label for="uf_source_crs_name">*Source CRS Name</label>
-          <input type="text" class="form-control" name="uf_source_crs_name" id="uf_source_crs_name" maxlength="20" placeholder="varchar(20)">
-      </div>
-      <div class="form-group">
-          <label for="uf_destination_crs_name">*Destination CRS Name</label>
-          <input type="text" class="form-control" name="uf_destination_crs_name" id="uf_destination_crs_name" maxlength="20" placeholder="varchar(20)">
-      </div>
-      <div class="form-group">
-          <label for="uf_link_speed">Link Speed</label>
-          <input type="text" class="form-control" name="uf_link_speed" id="uf_link_speed" maxlength="11" placeholder="int(11)">
-      </div>
-      <div class="form-group">
-          <label for="uf_default_cost">Default Cost</label>
-          <input type="text" class="form-control" name="uf_default_cost" id="uf_default_cost" maxlength="11" placeholder="int(11)">
-      </div>
-      <div class="form-group">
-        <label for="uf_bundle_name">Bundle Name</label>
-        <input type="text" class="form-control" name="uf_bundle_name" id="uf_bundle_name" maxlength="20" placeholder="varchar(20)">
-      </div>
-
-      <div class="form-group">
-          <label for="uf_shutdown">Shutdown</label>
-          <select class="form-control" name="uf_shutdown" id="uf_shutdown">
-                <option value='N'>False</option>
-                <option value='Y'>True</option>
-          </select>
-      </div>
-
-
-      <div class="form-group">
-            <input type="hidden" name="uf_action" id="uf_action">
-            <input type="hidden" name="uf_key_link_interface_ip" id="uf_key_link_interface_ip">
-            <button type="button" class="btn btn-primary" onclick="saveLinkMaster(this.form);">Save</button>
-            <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-      </div>
-      </form>
-      </div>
-    </div>
-  </div>
-</div>
-
diff --git a/admportal/views/partials/max_port_speed.ejs b/admportal/views/partials/max_port_speed.ejs
deleted file mode 100644
index a578308e..00000000
--- a/admportal/views/partials/max_port_speed.ejs
+++ /dev/null
@@ -1,86 +0,0 @@
- <div class="modal fade" id="add_max_port_speed" tabindex="-1" role="dialog"
-        aria-labelledby="add_max_port_speed_label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Add Max Port Speed</h4>
-          </div>
-          <div class="modal-body">
-            <form name="addForm" role="form" action="/resalloc/addMaxPortSpeed" method="POST">
-              <div class="form-group">
-                <label for="nf_image_file_name">*Image File Name</label>
-                <input type="text" class="form-control" maxlength="50" name="nf_image_file_name" id="nf_image_file_name" placeholder="varchar(50)">
-              </div>
-              <div class="form-group">
-                <label for="nf_end_point_position">*End Point Position</label>
-                <input type="text" class="form-control" maxlength="50" name="nf_end_point_position" id="nf_end_point_position" placeholder="varchar(50)">
-              </div>
-              <div class="form-group">
-                <label for="nf_interface_name">*Interface Name</label>
-                <input type="text" class="form-control" maxlength="100" name="nf_interface_name" id="nf_interface_name" placeholder="varchar(100)" >
-              </div>
-              <div class="form-group">
-                <label for="nf_max_speed">*Max Speed</label>
-                <input type="text" class="form-control" maxlength="50" name="nf_max_speed" id="nf_max_speed" placeholder="bigint(20)">
-              </div>
-              <div class="form-group">
-                <label for="nf_unit">*Unit</label>
-                <input type="text" class="form-control" maxlength="10" name="nf_unit" id="nf_unit" placeholder="varchar(10)">
-              </div>
-              <div class="form-group">
-                <input type="hidden" name="nf_action" id="nf_action">
-                <button type="button" class="btn btn-primary" onclick="submitMaxPortSpeed(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-   <div class="modal fade" id="update_max_port_speed" tabindex="-1" role="dialog" 
-		aria-labelledby="update_max_port_speed_label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Update Max Port Speed</h4>
-          </div>
-          <div class="modal-body">
-            <form name="updateForm" role="form" action="/resalloc/updateMaxPortSpeed" method="POST">
-              <div class="form-group">
-                <label for="uf_max_port_speed_id">*ID</label>
-                <input readonly type="text" class="form-control" name="uf_max_port_speed_id" id="uf_max_port_speed_id">
-              </div>
-              <div class="form-group">
-                <label for="uf_image_file_name">*Image File Name</label>
-                <input type="text" class="form-control" maxlength="50" name="uf_image_file_name" id="uf_image_file_name" placeholder="varchar(50)">
-              </div>
-              <div class="form-group">
-                <label for="uf_end_point_position">*End Point Position</label>
-                <input type="text" class="form-control" maxlength="50" name="uf_end_point_position" id="uf_end_point_position" placeholder="varchar(50)">
-              </div>
-              <div class="form-group">
-                <label for="uf_interface_name">*Interface Name</label>
-                <input type="text" class="form-control" maxlength="100" name="uf_interface_name" id="uf_interface_name" placeholder="varchar(100)">
-              </div>
-              <div class="form-group">
-                <label for="uf_max_speed">*Max Speed</label>
-                <input type="text" class="form-control" maxlength="50" name="uf_max_speed" id="uf_max_speed" placeholder="bigint(20)">
-			  </div>
-              <div class="form-group">
-                <label for="uf_unit">*Unit</label>
-                <input type="text" class="form-control" maxlength="10" name="uf_unit" id="uf_unit" placeholder="varchar(10)">
-			  </div>
-              <div class="form-group">
-				<input type="hidden" name="uf_action" id="uf_action">
-				<input type="hidden" name="uf_key_max_port_speed_id" id="uf_key_max_port_speed_id">
-                <button type="button" class="btn btn-primary" onclick="submitMaxPortSpeed(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
diff --git a/admportal/views/partials/max_server_speed.ejs b/admportal/views/partials/max_server_speed.ejs
deleted file mode 100644
index 6212414c..00000000
--- a/admportal/views/partials/max_server_speed.ejs
+++ /dev/null
@@ -1,88 +0,0 @@
-<div class="modal fade" id="add_max_server_speed" tabindex="-1" role="dialog"
-        aria-labelledby="add_max_server_speed_label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Add Max Server Speed</h4>
-          </div>
-          <div class="modal-body">
-            <form name="addForm" role="form" action="/resalloc/addMaxServerSpeed" method="POST">
-              <div class="form-group">
-                <label for="nf_server_model">*Server ModelName</label>
-                <input type="text" class="form-control" maxlength="50" name="nf_server_model" id="nf_server_model" placeholder="varchar(50)">
-              </div>
-              <div class="form-group">
-                <label for="nf_evc_count">*EVC Count</label>
-                <input type="text" class="form-control" maxlength="50" name="nf_evc_count" id="nf_evc_count" placeholder="smallint(6)">
-              </div>
-              <div class="form-group">
-                <label for="nf_max_speed">*Max Speed</label>
-                <input type="text" class="form-control" maxlength="100" name="nf_max_speed" id="nf_max_speed" placeholder="bigint(20)">
-              </div>
-              <div class="form-group">
-                <label for="nf_unit">*Unit</label>
-                <input type="text" class="form-control" maxlength="10" name="nf_unit" id="nf_unit" placeholder="varchar(10)">
-              </div>
-              <div class="form-group">
-                <label for="nf_description">Description</label>
-                <input type="text" class="form-control" maxlength="500" name="nf_description" id="nf_description" placeholder="varchar(500)">
-              </div>
-              <div class="form-group">
-                <input type="hidden" name="nf_action" id="nf_action">
-                <input type="hidden" name="nf_key_max_server_speed_id" id="nf_key_max_server_speed_id">
-                <button type="button" class="btn btn-primary" onclick="submitMaxServerSpeed(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-
-   <div class="modal fade" id="update_max_server_speed" tabindex="-1" role="dialog" 
-		aria-labelledby="max_server_speed_label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Update Max Server Speed</h4>
-          </div>
-          <div class="modal-body">
-            <form name="updateForm" role="form" action="/resalloc/updateMaxServerSpeed" method="POST">
-              <div class="form-group">
-                <label for="uf_max_server_speed_id">*ID</label>
-                <input readonly type="text" class="form-control" name="uf_max_server_speed_id" id="uf_max_server_speed_id">
-              </div>
-              <div class="form-group">
-                <label for="uf_server_model">*Server Model</label>
-                <input type="text" class="form-control" maxlength="50" name="uf_server_model" id="uf_server_model" placeholder="varchar(50)">
-              </div>
-              <div class="form-group">
-                <label for="uf_evc_count">*EVC Count</label>
-                <input type="text" class="form-control" maxlength="50" name="uf_evc_count" id="uf_evc_count" placeholder="smallint(6)">
-              </div>
-              <div class="form-group">
-                <label for="uf_max_speed">*Max Speed</label>
-                <input type="text" class="form-control" maxlength="50" name="uf_max_speed" id="uf_max_speed" placeholder="bigint(20)">
-			  </div>
-              <div class="form-group">
-                <label for="uf_unit">*Unit</label>
-                <input type="text" class="form-control" maxlength="10" name="uf_unit" id="uf_unit" placeholder="varchar(10)">
-			  </div>
-              <div class="form-group">
-                <label for="uf_description">Description</label>
-                <input type="text" class="form-control" maxlength="500" name="uf_description" id="uf_description" placeholder="varchar(500)">
-              </div>
-              <div class="form-group">
-				<input type="hidden" name="uf_action" id="uf_action">
-				<input type="hidden" name="uf_key_max_server_speed_id" id="uf_key_max_server_speed_id">
-                <button type="button" class="btn btn-primary" onclick="submitMaxServerSpeed(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
diff --git a/admportal/views/partials/metroroadm_service_request.ejs b/admportal/views/partials/metroroadm_service_request.ejs
deleted file mode 100644
index e198f7fd..00000000
--- a/admportal/views/partials/metroroadm_service_request.ejs
+++ /dev/null
@@ -1,170 +0,0 @@
-<div class="modal fade" id="add_metroroadm_service_request" tabindex="-1" role="dialog"
-        aria-labelledby="add_metroroadm_service_request_label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Add Metro ROADM Service Request</h4>
-          </div>
-          <div class="modal-body">
-            <form name="addForm" role="form" action="/tunnel/addMetroRoadmServiceRequest" method="POST">
-              <div class="form-group">
-                <label for="nf_request_id">*Request ID</label>
-                <input type="text" class="form-control" maxlength="75" name="nf_request_id" id="nf_request_id" placeholder="varchar(75)">
-              </div>
-              <div class="form-group">
-                <label for="nf_request_source">Request Source</label>
-                <input type="text" class="form-control" maxlength="20" name="nf_request_source" id="nf_request_source" placeholder="varchar(20)">
-              </div>
-              <div class="form-group">
-                <label for="nf_notification_url">Notification URL</label>
-                <input type="text" class="form-control" maxlength="255" name="nf_notification_url" id="nf_notification_url" placeholder="varchar(255)">
-              </div>
-              <div class="form-group">
-                <label for="nf_l_action">*Action</label>
-                <input type="text" class="form-control" maxlength="10" name="nf_l_action" id="nf_l_action" placeholder="varchar(10)">
-              </div>
-              <div class="form-group">
-                <label for="nf_request_timestamp">*Request Timestamp</label>
-                <input type="text" class="form-control" maxlength="80" name="nf_request_timestamp" id="nf_request_timestamp" placeholder="YYYY-MM-DD HH:MM:SS">
-              </div>
-              <div class="form-group">
-                <label for="nf_update_timestamp">Update Timestamp</label>
-                <input type="text" class="form-control" maxlength="80" name="nf_update_timestamp" id="nf_update_timestamp" placeholder="varchar(80)">
-              </div>
-              <div class="form-group">
-                <label for="nf_request_status">*Request Status</label>
-                <input type="text" class="form-control" maxlength="20" name="nf_request_status" id="nf_request_status" placeholder="varchar(20)">
-              </div>
-              <div class="form-group">
-                <label for="nf_processing_status">*Processing Status</label>
-                <input type="text" class="form-control" maxlength="40" name="nf_processing_status" id="nf_processing_status" placeholder="varchar(40)">
-              </div>
-              <div class="form-group">
-                <label for="nf_reason_code">Reason Code</label>
-                <input type="text" class="form-control" maxlength="255" name="nf_reason_code" id="nf_reason_code" placeholder="varchar(255)">
-              </div>
-              <div class="form-group">
-                <label for="nf_reason_message">Reason Message</label>
-                <input type="text" class="form-control" maxlength="255" name="nf_reason_message" id="nf_reason_message" placeholder="varchar(255)">
-              </div>
-              <div class="form-group">
-                <label for="nf_service_id">*Service Id</label>
-                <input type="text" class="form-control" maxlength="50" name="nf_service_id" id="nf_service_id" placeholder="varchar(50)">
-              </div>
-              <div class="form-group">
-                <label for="nf_common_id">Common Id</label>
-                <input type="text" class="form-control" maxlength="12" name="nf_common_id" id="nf_common_id" placeholder="varchar(12)">
-              </div>
-              <div class="form-group">
-                <label for="nf_clli_a">CLLI A</label>
-                <input type="text" class="form-control" maxlength="20" name="nf_clli_a" id="nf_clli_a" placeholder="varchar(20)">
-              </div>
-              <div class="form-group">
-                <label for="nf_clli_z">CLLI Z</label>
-                <input type="text" class="form-control" maxlength="20" name="nf_clli_z" id="nf_clli_z" placeholder="varchar(20)">
-              </div>
-              <div class="form-group">
-                <label for="nf_customer">Customer</label>
-                <input type="text" class="form-control" maxlength="255" name="nf_customer" id="nf_customer" placeholder="varchar(255)">
-              </div>
-              <div class="form-group">
-                <label for="nf_controller_id">*Controller Id</label>
-                <input type="text" class="form-control" maxlength="255" name="nf_controller_id" id="nf_controller_id" placeholder="varchar(255)">
-              </div>
-              <div class="form-group">
-                <input type="hidden" name="nf_action" id="nf_action">
-                <button type="button" class="btn btn-primary" onclick="submitMetroRoadmServiceRequest(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-   <div class="modal fade" id="update_metroroadm_service_request" tabindex="-1" role="dialog" 
-		aria-labelledby="update_metroroadm_service_request_label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Update Metro ROADM Service Request</h4>
-          </div>
-          <div class="modal-body">
-            <form role="form" action="/tunnel/updateMetroRoadmServiceRequest" method="POST">
-              <div class="form-group">
-                    <label for="uf_request_id">*Request ID</label>
-                    <input type="text" class="form-control" maxlength="75" name="uf_request_id" id="uf_request_id" placeholder="varchar(75)">
-              </div>
-              <div class="form-group">
-                <label for="uf_request_source">Request Source</label>
-                <input type="text" class="form-control" maxlength="20" name="uf_request_source" id="uf_request_source" placeholder="varchar(20)">
-              </div>
-              <div class="form-group">
-                <label for="uf_notification_url">Notification URL</label>
-                <input type="text" class="form-control" maxlength="255" name="uf_notification_url" id="uf_notification_url" placeholder="varchar(255)">
-              </div>
-              <div class="form-group">
-                <label for="uf_l_action">*Action</label>
-                <input type="text" class="form-control" maxlength="10" name="uf_l_action" id="uf_l_action" placeholder="varchar(10)">
-              </div>
-              <div class="form-group">
-                <label for="uf_request_timestamp">*Request Timestamp</label>
-                <input type="text" class="form-control" maxlength="80" name="uf_request_timestamp" id="uf_request_timestamp" placeholder="varchar(80)">
-              </div>
-              <div class="form-group">
-                <label for="uf_update_timestamp">Update Timestamp</label>
-                <input type="text" class="form-control" maxlength="80" name="uf_update_timestamp" id="uf_update_timestamp" placeholder="varchar(80)">
-              </div>
-              <div class="form-group">
-                <label for="uf_request_status">*Request Status</label>
-                <input type="text" class="form-control" maxlength="20" name="uf_request_status" id="uf_request_status" placeholder="varchar(20)">
-              </div>
-              <div class="form-group">
-                <label for="uf_processing_status">*Processing Status</label>
-                <input type="text" class="form-control" maxlength="40" name="uf_processing_status" id="uf_processing_status" placeholder="varchar(40)">
-              </div>
-              <div class="form-group">
-                <label for="uf_reason_code">Reason Code</label>
-                <input type="text" class="form-control" maxlength="255" name="uf_reason_code" id="uf_reason_code" placeholder="varchar(255)">
-              </div>
-              <div class="form-group">
-                <label for="uf_reason_message">Reason Message</label>
-                <input type="text" class="form-control" maxlength="255" name="uf_reason_message" id="uf_reason_message" placeholder="varchar(255)">
-              </div>
-              <div class="form-group">
-                <label for="uf_service_id">*Service Id</label>
-                <input type="text" class="form-control" maxlength="50" name="uf_service_id" id="uf_service_id" placeholder="varchar(50)">
-              </div>
-              <div class="form-group">
-                <label for="uf_common_id">Common Id</label>
-                <input type="text" class="form-control" maxlength="12" name="uf_common_id" id="uf_common_id" placeholder="varchar(12)">
-              </div>
-              <div class="form-group">
-                <label for="uf_clli_a">CLLI A</label>
-                <input type="text" class="form-control" maxlength="20" name="uf_clli_a" id="uf_clli_a" placeholder="varchar(20)">
-              </div>
-              <div class="form-group">
-                <label for="uf_clli_z">CLLI Z</label>
-                <input type="text" class="form-control" maxlength="20" name="uf_clli_z" id="uf_clli_z" placeholder="varchar(20)">
-              </div>
-              <div class="form-group">
-                <label for="uf_customer">Customer</label>
-                <input type="text" class="form-control" maxlength="255" name="uf_customer" id="uf_customer" placeholder="varchar(255)">
-              </div>
-              <div class="form-group">
-                <label for="uf_controller_id">*Controller Id</label>
-                <input type="text" class="form-control" maxlength="255" name="uf_controller_id" id="uf_controller_id" placeholder="varchar(255)">
-              </div>
-              <div class="form-group">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <input type="hidden" name="uf_key_request_id" id="uf_key_request_id">
-                <button type="button" class="btn btn-primary" onclick="submitMetroRoadmServiceRequest(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
diff --git a/admportal/views/partials/nat.ejs b/admportal/views/partials/nat.ejs
deleted file mode 100644
index 973c2549..00000000
--- a/admportal/views/partials/nat.ejs
+++ /dev/null
@@ -1,38 +0,0 @@
-   <div class="modal fade" id="nat-modal" tabindex="-1" role="dialog" 
-		aria-labelledby="nat-modal-label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">nat</h4>
-          </div>
-          <div class="modal-body">
-            <form id="nat_form" role="form" action="" method="POST">
-              <div class="form-group">
-                <label for="v4_nat_enabled">v4-nat-enabled</label>
-                <input type="text" class="form-control" name="v4_nat_enabled" id="v4_nat_enabled">
-              </div>
-
-<!--
-              <div class="form-group">
-				<input type="hidden" name="svc_instance_id" id="svc_instance_id">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submit(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
--->
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-<script type="text/javascript">
-function submit(form){
-	$('#nat-modal').modal('hide');
-	form.action = form.uf_action.value;
-	form.submit();
-	return;
-}
-</script>
-
diff --git a/admportal/views/partials/nb_vlan_pool.ejs b/admportal/views/partials/nb_vlan_pool.ejs
deleted file mode 100644
index d5e8973b..00000000
--- a/admportal/views/partials/nb_vlan_pool.ejs
+++ /dev/null
@@ -1,38 +0,0 @@
-   <div class="modal fade" id="update_nb_vlan_pool" tabindex="-1" role="dialog" 
-		aria-labelledby="update_nb_vlan_pool_label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Update NetBond VLAN Pool</h4>
-          </div>
-          <div class="modal-body">
-          <form name="updateForm" role="form" action="/gamma/updateNbVlanPool" method="POST">
-
-			 <div class="form-group">
-             <label for="nf_plan_type">Status</label>
-                <select class="form-control" name="uf_status" id="uf_status">
-                    <option value="AVAILABLE">AVAILABLE</option>
-                    <option value="RESERVED">RESERVED</option>
-                    <option value="IN-USE">IN-USE</option>
-                </select>
-              </div>
-
-              <div class="form-group">
-				<input type="hidden" name="uf_action" id="uf_action">
-				<input type="hidden" name="uf_key_aic_site_id" id="uf_key_aic_site_id">
-				<input type="hidden" name="uf_key_availability_zone" id="uf_key_availability_zone">
-				<input type="hidden" name="uf_key_vlan_plan_id" id="uf_key_vlan_plan_id">
-				<input type="hidden" name="uf_key_plan_type" id="uf_key_plan_type">
-				<input type="hidden" name="uf_key_purpose" id="uf_key_purpose">
-				<input type="hidden" name="uf_key_vlan_id" id="uf_key_vlan_id">
-
-				<button type="button" class="btn btn-primary" 
-					onclick="saveNbVlanPool(this.form);">Save</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
diff --git a/admportal/views/partials/nb_vlan_range.ejs b/admportal/views/partials/nb_vlan_range.ejs
deleted file mode 100644
index 4cc24a2d..00000000
--- a/admportal/views/partials/nb_vlan_range.ejs
+++ /dev/null
@@ -1,45 +0,0 @@
-   <div class="modal fade" id="add_vlan_range" tabindex="-1" role="dialog" 
-		aria-labelledby="add_vlan_range_label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Add NetBond VLAN Range</h4>
-          </div>
-          <div class="modal-body">
-          <form name="addForm" role="form" action="/gamma/saveNbVlanRange" method="POST">
-
-			 <div class="form-group">
-             <label for="nf_plan_type">*Plan Type</label>
-                <select class="form-control" name="nf_plan_type" id="nf_plan_type">
-                    <option value="NB VNAT">NB VNAT</option>
-                </select>
-              </div>
-
-			  <div class="form-group">
-              <label for="nf_purpose">*Purpose</label>
-                <select class="form-control" name="nf_purpose" id="nf_purpose">
-                    <option value=CUSTOMER>CUSTOMER</option>
-                    <option value=PARTNER>PARTNER</option>
-                </select>
-              </div>
-
-              <div class="form-group">
-                <label for="nf_range_start">*Range Start</label>
-                <input type="text" class="form-control" name="nf_range_start" id="nf_range_start" maxlength="4" placeholder="int(4)">
-              </div>
-
-              <div class="form-group">
-                <label for="nf_range_end">*Range End</label>
-                <input type="text" class="form-control" name="nf_range_end" id="nf_range_end" maxlength="4" placeholder="int(4)">
-              </div>
-              <div class="form-group">
-				<input type="hidden" name="nf_action" id="nf_action">
-				<button type="button" class="btn btn-primary" onclick="saveNbVlanRange(this.form);">Save</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
diff --git a/admportal/views/partials/ncs_credentials.ejs b/admportal/views/partials/ncs_credentials.ejs
deleted file mode 100644
index a35b7e48..00000000
--- a/admportal/views/partials/ncs_credentials.ejs
+++ /dev/null
@@ -1,74 +0,0 @@
-<div class="modal fade" id="add_ncs_credentials" tabindex="-1" role="dialog"
-        aria-labelledby="add_ncs_credentials_label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Add NCS Credentials</h4>
-          </div>
-          <div class="modal-body">
-            <form name="addForm" role="form" action="/ucpe/addNcsCredentials" method="POST">
-              <div class="form-group">
-                <label for="nf_customer_name">*Customer Name</label>
-                <input type="text" class="form-control" maxlength="255" aria-describedby="helpCName" name="nf_customer_name" id="nf_customer_name" placeholder="varchar(255)">
-				<span id="helpCName" class="help-block">The Customer Name must match exactly whats in the NCS Servers table.</span>
-              </div>
-              <div class="form-group">
-                <label for="nf_ncs_username">*NCS Username</label>
-                <input type="text" class="form-control" maxlength="255" name="nf_ncs_username" id="nf_ncs_username" placeholder="varchar(255)">
-              </div>
-              <div class="form-group">
-                <label for="nf_ncs_password">*NCS Password</label>
-                <input type="password" class="form-control" maxlength="255" name="nf_ncs_password" id="nf_ncs_password" placeholder="varbinary(255)">
-              </div>
-			  <div class="form-group">
-                <label for="nf_phs_password">*Confirm NCS Password</label>
-                <input type="password" class="form-control" maxlength="255" name="nf_confirm_ncs_password" id="nf_confirm_ncs_password" placeholder="varbinary(255)">
-              </div>
-              <div class="form-group">
-                <input type="hidden" name="nf_action" id="nf_action">
-                <button type="button" class="btn btn-primary" onclick="submitNcsCredentials(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-   <div class="modal fade" id="update_ncs_credentials" tabindex="-1" role="dialog" 
-		aria-labelledby="update_ncs_credentials_label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Update NCS Credentials</h4>
-          </div>
-          <div class="modal-body">
-            <form role="form" action="/ucpe/updateNcsCredentials" method="POST">
-              <div class="form-group">
-                <label for="uf_customer_name">*Customer Name</label>
-                <input readonly type="text" class="form-control" name="uf_customer_name" id="uf_customer_name">
-              </div>
-              <div class="form-group">
-                <label for="uf_ncs_username">*NCS Username</label>
-                <input type="text" class="form-control" maxlength="255" name="uf_ncs_username" id="uf_ncs_username">
-              </div>
-              <div class="form-group">
-                <label for="uf_ncs_password">*NCS Password</label>
-                <input type="password" class="form-control" maxlength="255" name="uf_ncs_password" id="uf_ncs_password">
-			  </div>
-			  <div class="form-group">
-                <label for="nf_phs_password">*Confirm NCS Password</label>
-                <input type="password" class="form-control" maxlength="255" name="uf_confirm_ncs_password" id="uf_confirm_ncs_password" placeholder="varbinary(255)">
-              </div>
-              <div class="form-group">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submitNcsCredentials(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
diff --git a/admportal/views/partials/network_connections.ejs b/admportal/views/partials/network_connections.ejs
deleted file mode 100644
index 72093233..00000000
--- a/admportal/views/partials/network_connections.ejs
+++ /dev/null
@@ -1,66 +0,0 @@
-   <div class="modal fade" 
-		id="network-connections-modal" tabindex="-1" role="dialog" 
-		aria-labelledby="network-connections-modal-label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">network-connections</h4>
-          </div>
-          <div class="modal-body">
-            <form role="form" action="" method="POST">
-              <div class="form-group">
-                <label for="stack_id">stack-id</label>
-                <input type="text" class="form-control" name="stack_id" id="stack_id">
-              </div>
-              <div class="form-group">
-                <label for="net_status">net-status</label>
-                <input type="text" class="form-control" name="net_status" id="net_status">
-              </div>
-              <div class="form-group">
-                <label for="connection_type">connection-type</label>
-                <input type="text" class="form-control" name="connection_type" id="connection_type">
-              </div>
-              <div class="form-group">
-                <label for="provider_network">provider-network</label>
-                <input type="text" class="form-control" name="provider_network" id="provider_network">
-              </div>
-              <div class="form-group">
-                <label for="interface_id">interface-id</label>
-                <input type="text" class="form-control" name="interface_id" id="interface_id">
-              </div>
-              <div class="form-group">
-                <label for="vlan">vlan</label>
-                <input type="text" class="form-control" name="vlan" id="vlan">
-              </div>
-              <div class="form-group">
-                <label for="port_group_name">port-group-name</label>
-                <input type="text" class="form-control" name="port_group_name" id="port_group_name">
-              </div>
-              <div class="form-group">
-                <label for="neutron_network_id">neutron-network-id</label>
-                <input type="text" class="form-control" name="neutron_network_id" id="neutron_network_id">
-              </div>
-
-<!--
-              <div class="form-group">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submit(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
--->
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-<script type="text/javascript">
-function submit(form){
-	$('#network-connections-modal').modal('hide');
-	form.action = form.uf_action.value;
-	form.submit();
-	return;
-}
-</script>
-
diff --git a/admportal/views/partials/network_profile.ejs b/admportal/views/partials/network_profile.ejs
deleted file mode 100644
index 81d7f32a..00000000
--- a/admportal/views/partials/network_profile.ejs
+++ /dev/null
@@ -1,59 +0,0 @@
-   <div class="modal fade" id="add_network_profile" tabindex="-1" role="dialog" 
-		aria-labelledby="add_network_profile" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Add Network Profile</h4>
-          </div>
-          <div class="modal-body">
-            <form name="addForm" role="form" action="/gamma/addNetworkProfile" method="POST">
-              <div class="form-group">
-                <label for="nf_network_type">*Network Type</label>
-                <input type="text" class="form-control" name="nf_network_type" id="nf_network_type" maxlength="100" placeholder="varchar(100)">
-              </div>
-              <div class="form-group">
-                <label for="nf_technology">Technology</label>
-                <input type="text" class="form-control" name="nf_technology" id="nf_technology" maxlength="100" placeholder="varchar(100)">
-              </div>
-              <div class="form-group">
-				<input type="hidden" name="nf_action" id="nf_action">
-				<button type="button" class="btn btn-primary" onclick="saveNetworkProfile(this.form);">Save</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-<div class="modal fade" id="update_network_profile" tabindex="-1" role="dialog"
-        aria-labelledby="update_network_profile_label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Update Network Profile</h4>
-          </div>
-          <div class="modal-body">
-            <form role="form" action="/gamma/updateNetworkProfile" method="POST">
-              <div class="form-group">
-                <label for="uf_network_type">*Network Type</label>
-                <input type="text" class="form-control" maxlength="100" name="uf_network_type" id="uf_network_type" placeholder="varchar(100)">
-              </div>
-              <div class="form-group">
-                <label for="uf_technology">Technology</label>
-                <input type="text" class="form-control" maxlength="100" name="uf_technology" id="uf_technology" placeholder="varchar(100)">
-              </div>
-              <div class="form-group">
-                <input type="hidden" name="uf_action" id="uf_action">
-                <input type="hidden" name="uf_key_network_type" id="uf_key_network_type">
-                <button type="button" class="btn btn-primary" onclick="saveNetworkProfile(this.form);">Save</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
diff --git a/admportal/views/partials/new_parameter.ejs b/admportal/views/partials/new_parameter.ejs
deleted file mode 100644
index 4a2c0fe3..00000000
--- a/admportal/views/partials/new_parameter.ejs
+++ /dev/null
@@ -1,37 +0,0 @@
-<div class="modal fade" id="new_parameter" tabindex="-1" role="dialog" 
-		aria-labelledby="new_parameter_label" aria-hidden="true">
-	<div class="modal-dialog">
-		<div class="modal-content">
-			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-				<h4 class="modal-title">Add Parameter</h4>
-			</div>
-			<div class="modal-body">
-				<form name="addForm" role="form" action="/admin/addParameter" method="POST">
-					<div class="form-group">
-						<label for="nf_name">*Name</label>
-						<input maxlength="100" type="text" class="form-control" name="nf_name" id="nf_name" placeholder="varchar(100)" />
-					</div>
-					<div class="form-group">
-						<label for="nf_value">*Value</label>
-						<input maxlength="100" type="text" class="form-control" name="nf_value" id="nf_value" placeholder="varchar(100)" />
-					</div>
-					<div class="form-group">
-						<label for="nf_category">Category</label>
-						<input maxlength="24" type="text" class="form-control" name="nf_category" id="nf_category" placeholder="varchar(24)" />
-					</div>
-					<div class="form-group">
-						<label for="nf_memo">Memo</label>
-						<input maxlength="128" type="text" class="form-control" name="nf_memo" id="nf_memo" placeholder="varchar(128)" />
-					</div>
-					<div class="form-group">
-						<input type="hidden" name="_csrf" value="<%= privilege.csrfToken %>" />
-          	<input type="hidden" name="nf_action" id="nf_action">
-          	<button type="button" class="btn btn-primary" onclick="submitParam(this.form);">Submit</button>
-          	<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-        	</div>
-        </form>
-			</div>
-		</div>
-	</div>
-</div>
diff --git a/admportal/views/partials/newuserform.ejs b/admportal/views/partials/newuserform.ejs
deleted file mode 100644
index 61bf2ddc..00000000
--- a/admportal/views/partials/newuserform.ejs
+++ /dev/null
@@ -1,38 +0,0 @@
-<div class="modal fade" id="new_user" tabindex="-1" role="dialog" aria-labelledby="new_user" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">New User</h4>
-          </div>
-          <div class="modal-body">
-            <form id="addForm" name="addForm" role="form" action="/user/addUser" method="POST">
-              <div class="form-group">
-                <label for="nf_email">Email</label>
-                <input type="email" class="form-control" name="nf_email" id="nf_email" placeholder="varchar(64)" maxlength="64" />
-              </div>
-              <div class="form-group">
-                <label for="nf_password">Password</label>
-                <input type="password" class="form-control" name="nf_password" id="nf_password" />
-              </div>
-              <div class="form-group">
-                <label for="nf_confirm_password">Confirm Password</label>
-                <input type="password" class="form-control" name="nf_confirm_password" id="nf_confirm_password" />
-              </div>
-              <div class="form-group">
-                <label for="nf_privilege">Privilege</label>
-                <select class="form-control" name="nf_privilege" id="nf_privilege">
-                    <option value=admin>Administrator</option>
-                    <option value=readonly>Readonly</option>
-                </select>
-              </div>
-              <div class="form-group">
-								<input type="hidden" name="_csrf" value="<%= privilege.csrfToken %>" />
-                <button type="button" class="btn btn-primary" onclick="submitUserAdmin(this.form);">Submit</button>
-		<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-</div>
diff --git a/admportal/views/partials/oper_status_modal.ejs b/admportal/views/partials/oper_status_modal.ejs
deleted file mode 100644
index ae6cbe06..00000000
--- a/admportal/views/partials/oper_status_modal.ejs
+++ /dev/null
@@ -1,68 +0,0 @@
-   <div class="modal fade" id="oper-status-modal" tabindex="-1" role="dialog" aria-labelledby="oper-status-modal-label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title" id="oper-status-modal-label">oper-status</h4>
-          </div>
-          <div class="modal-body">
-            <form id="oper_status_form" role="form" action="" method="POST">
-              <div class="form-group">
-                <label for="order_status">order-status</label>
-                <input type="text" class="form-control" name="order_status" id="order_status">
-              </div>
-              <div class="form-group">
-                <label for="modify_timestamp">modify-timestamp</label>
-                <input type="text" class="form-control" name="modify_timestamp" id="modify_timestamp">
-              </div>
-              <div class="form-group">
-                <label for="last_svc_request_id">last-svc-request-id</label>
-                <input type="text" class="form-control" name="last_svc_request_id" id="last_svc_request_id">
-              </div>
-              <div class="form-group">
-                <label for="last_sub_action">last-sub-action</label>
-                <input type="text" class="form-control" name="last_sub_action" id="last_sub_action">
-              </div>
-              <div class="form-group">
-                <label for="t_defaulted_v6_vrlan">t-defaulted-v6-vrlan</label>
-                <input type="text" class="form-control" name="t_defaulted_v6_vrlan" id="t_defaulted_v6_vrlan">
-              </div>
-              <div class="form-group">
-                <label for="last_action">last-action</label>
-                <input type="text" class="form-control" name="last_action" id="last_action">
-              </div>
-              <div class="form-group">
-                <label for="create_timestamp">create-timestamp</label>
-                <input type="text" class="form-control" name="create_timestamp" id="create_timestamp">
-              </div>
-              <div class="form-group">
-                <label for="maintenance_indicator">maintenance-indicator</label>
-                <input type="text" class="form-control" name="maintenance_indicator" id="maintenance_indicator">
-              </div>
-              <div class="form-group">
-                <label for="last_order_status">last-order-status</label>
-                <input type="text" class="form-control" name="last_order_status" id="last_order_status">
-              </div>
-
-<!--
-              <div class="form-group">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submit(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
--->
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-<script type="text/javascript">
-function submit(form){
-	$('#service-status-modal').modal('hide');
-	form.action = form.uf_action.value;
-	form.submit();
-	return;
-}
-</script>
-
diff --git a/admportal/views/partials/owbc_properties.ejs b/admportal/views/partials/owbc_properties.ejs
deleted file mode 100644
index 0d640325..00000000
--- a/admportal/views/partials/owbc_properties.ejs
+++ /dev/null
@@ -1,98 +0,0 @@
-<div class="modal fade" id="add_owbc_properties" tabindex="-1" role="dialog"
-        aria-labelledby="add_owbc_properties_label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Add OWBC Properties</h4>
-          </div>
-          <div class="modal-body">
-            <form name="addForm" role="form" action="/tunnel/addOwbcProperties" method="POST">
-              <div class="form-group">
-                <label for="nf_controller_id">*Controller ID</label>
-                <input type="text" class="form-control" maxlength="255" name="nf_controller_id" id="nf_controller_id" placeholder="varchar(255)">
-              </div>
-              <div class="form-group">
-                <label for="nf_base_uri">*Base URL</label>
-                <input type="text" class="form-control" maxlength="255" name="nf_base_uri" id="nf_base_uri" placeholder="varchar(255)">
-              </div>
-              <div class="form-group">
-                <label for="nf_service_create_extension">*Service Create Extension</label>
-                <input type="text" class="form-control" maxlength="255" name="nf_service_create_extension" id="nf_service_create_extension" placeholder="varchar(255)">
-              </div>
-              <div class="form-group">
-                <label for="nf_service_delete_extension">*Service Delete Extension</label>
-                <input type="text" class="form-control" maxlength="255" name="nf_service_delete_extension" id="nf_service_delete_extension" placeholder="varchar(255)">
-              </div>
-              <div class="form-group">
-                <label for="nf_auth_username">*Auth Username</label>
-                <input type="text" class="form-control" maxlength="80" name="nf_auth_username" id="nf_auth_username" placeholder="varchar(80)">
-              </div>
-              <div class="form-group">
-                <label for="nf_auth_password">*Auth Password</label>
-                <input type="password" class="form-control" maxlength="80" name="nf_auth_password" id="nf_auth_password" placeholder="varbinary(80)">
-              </div>
-              <div class="form-group">
-                <label for="nf_confirm_auth_password">*Confirm Auth Password</label>
-                <input type="password" class="form-control" maxlength="80" name="nf_confirm_auth_password" id="nf_confirm_auth_password" placeholder="varbinary(80)">
-              </div>
-              <div class="form-group">
-                <input type="hidden" name="nf_action" id="nf_action">
-                <button type="button" class="btn btn-primary" onclick="submitOwbcProperties(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-   <div class="modal fade" id="update_owbc_properties" tabindex="-1" role="dialog" 
-		aria-labelledby="update_owbc_properties_label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Update OWBC Properties</h4>
-          </div>
-          <div class="modal-body">
-            <form role="form" action="/tunnel/updateOwbcProperties" method="POST">
-              <div class="form-group">
-                <label for="uf_controller_id">*Controller ID</label>
-                <input type="text" class="form-control" maxlength="255" name="uf_controller_id" id="uf_controller_id" placeholder="varchar(255)">
-              </div>
-              <div class="form-group">
-                <label for="uf_base_uri">*Base URL</label>
-                <input type="text" class="form-control" maxlength="255" name="uf_base_uri" id="uf_base_uri" placeholder="varchar(255)">
-              </div>
-              <div class="form-group">
-                <label for="uf_service_create_extension">*Service Create Extension</label>
-                <input type="text" class="form-control" maxlength="255" name="uf_service_create_extension" id="uf_service_create_extension" placeholder="varchar(255)">
-              </div>
-              <div class="form-group">
-                <label for="uf_service_delete_extension">*Service Delete Extension</label>
-                <input type="text" class="form-control" maxlength="255" name="uf_service_delete_extension" id="uf_service_delete_extension" placeholder="varchar(255)">
-              </div>
-              <div class="form-group">
-                <label for="uf_auth_username">*Auth Username</label>
-                <input type="text" class="form-control" maxlength="80" name="uf_auth_username" id="uf_auth_username" placeholder="varchar(80)">
-              </div>
-              <div class="form-group">
-                <label for="uf_auth_password">*Auth Password</label>
-                <input type="password" class="form-control" maxlength="80" name="uf_auth_password" id="uf_auth_password" placeholder="varbinary(80)">
-              </div>
-              <div class="form-group">
-                <label for="uf_confirm_auth_password">*Confirm Auth Password</label>
-                <input type="password" class="form-control" maxlength="80" name="uf_confirm_auth_password" id="uf_confirm_auth_password" placeholder="varbinary(80)">
-              </div>
-              <div class="form-group">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <input type="hidden" name="uf_key_controller_id" id="uf_key_controller_id">
-                <button type="button" class="btn btn-primary" onclick="submitOwbcProperties(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
diff --git a/admportal/views/partials/partner_properties.ejs b/admportal/views/partials/partner_properties.ejs
deleted file mode 100644
index 1f1d601a..00000000
--- a/admportal/views/partials/partner_properties.ejs
+++ /dev/null
@@ -1,74 +0,0 @@
-<div class="modal fade" id="add_partner_properties" tabindex="-1" role="dialog"
-        aria-labelledby="add_partner_properties_label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Add Partner Properties</h4>
-          </div>
-          <div class="modal-body">
-            <form name="addForm" role="form" action="/tunnel/addPartnerProperties" method="POST">
-              <div class="form-group">
-                <label for="nf_partner">*Partner</label>
-                <input type="text" class="form-control" maxlength="100" name="nf_partner" id="nf_partner" placeholder="varchar(100)">
-              </div>
-              <div class="form-group">
-                <label for="nf_auth_username">*Auth Username</label>
-                <input type="text" class="form-control" maxlength="80" name="nf_auth_username" id="nf_auth_username" placeholder="varchar(80)">
-              </div>
-              <div class="form-group">
-                <label for="nf_auth_password">*Auth Password</label>
-                <input type="password" class="form-control" maxlength="255" name="nf_auth_password" id="nf_auth_password" placeholder="varbinary(255)">
-              </div>
-              <div class="form-group">
-                <label for="nf_confirm_auth_password">*Confirm Auth Password</label>
-                <input type="password" class="form-control" maxlength="255" name="nf_confirm_auth_password" id="nf_confirm_auth_password" placeholder="varbinary(255)">
-              </div>
-              <div class="form-group">
-                <input type="hidden" name="nf_action" id="nf_action">
-                <button type="button" class="btn btn-primary" onclick="submitPartnerProperties(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-   <div class="modal fade" id="update_partner_properties" tabindex="-1" role="dialog" 
-		aria-labelledby="update_partner_properties_label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Update Partner Properties</h4>
-          </div>
-          <div class="modal-body">
-            <form role="form" action="/tunnel/updatePartnerProperties" method="POST">
-              <div class="form-group">
-                <label for="uf_partner">*Partner</label>
-                <input type="text" class="form-control" maxlength="100" name="uf_partner" id="uf_partner" placeholder="varchar(100)">
-              </div>
-              <div class="form-group">
-                <label for="uf_auth_username">*Auth Username</label>
-                <input type="text" class="form-control" maxlength="80" name="uf_auth_username" id="uf_auth_username" placeholder="varchar(80)">
-              </div>
-              <div class="form-group">
-                <label for="uf_auth_password">*Auth Password</label>
-                <input type="password" class="form-control" maxlength="255" name="uf_auth_password" id="uf_auth_password" placeholder="varbinary(255)">
-              </div>
-              <div class="form-group">
-                <label for="uf_confirm_auth_password">*Confirm Auth Password</label>
-                <input type="password" class="form-control" maxlength="255" name="uf_confirm_auth_password" id="uf_confirm_auth_password" placeholder="varbinary(255)">
-              </div>
-              <div class="form-group">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <input type="hidden" name="uf_key_partner" id="uf_key_partner">
-                <button type="button" class="btn btn-primary" onclick="submitPartnerProperties(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
diff --git a/admportal/views/partials/pat.ejs b/admportal/views/partials/pat.ejs
deleted file mode 100644
index 8cc91555..00000000
--- a/admportal/views/partials/pat.ejs
+++ /dev/null
@@ -1,50 +0,0 @@
-   <div class="modal fade" id="pat-modal" tabindex="-1" role="dialog" 
-		aria-labelledby="pat-modal-label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">pat</h4>
-          </div>
-          <div class="modal-body">
-            <form id="pat_form" role="form" action="" method="POST">
-              <div class="form-group">
-                <label for="v4_pat_default_pool_prefix_length">v4-pat-default-pool-prefix-length</label>
-                <input type="text" class="form-control" name="v4_pat_default_pool_prefix_length" id="v4_pat_default_pool_prefix_length">
-              </div>
-              <div class="form-group">
-                <label for="use_v4_default_pool">use-v4-default-pool</label>
-                <input type="text" class="form-control" name="use_v4_default_pool" id="use_v4_default_pool">
-              </div>
-              <div class="form-group">
-                <label for="v4_pat_enabled">v4-pat-enabled</label>
-                <input type="text" class="form-control" name="v4_pat_enabled" id="v4_pat_enabled">
-              </div>
-              <div class="form-group">
-                <label for="v4_pat_default_pool_prefix">v4-pat-default-pool-prefix</label>
-                <input type="text" class="form-control" name="v4_pat_default_pool_prefix" id="v4_pat_default_pool_prefix">
-              </div>
-
-<!--
-              <div class="form-group">
-				<input type="hidden" name="svc_instance_id" id="svc_instance_id">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submit(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
--->
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-<script type="text/javascript">
-function submit(form){
-	$('#pat-modal').modal('hide');
-	form.action = form.uf_action.value;
-	form.submit();
-	return;
-}
-</script>
-
diff --git a/admportal/views/partials/pat_pools.ejs b/admportal/views/partials/pat_pools.ejs
deleted file mode 100644
index 5b0b3f09..00000000
--- a/admportal/views/partials/pat_pools.ejs
+++ /dev/null
@@ -1,46 +0,0 @@
-   <div class="modal fade" id="pat-pools-modal" tabindex="-1" role="dialog" 
-		aria-labelledby="pat-pools-modal-label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">v4-pat-pools</h4>
-          </div>
-          <div class="modal-body">
-            <form id="pat_pools-form" role="form" action="" method="POST">
-              <div class="form-group">
-                <label for="v4_pat__pool_next_hop_address">v4-pat-pool-next-hop-address</label>
-                <input type="text" class="form-control" name="v4_pat_pool_next_hop_address" id="v4_pat_pool_next_hop_address">
-              </div>
-              <div class="form-group">
-                <label for="v4_pat_pool_prefix_length">v4-pat-pool-prefix-length</label>
-                <input type="text" class="form-control" name="v4_pat_pool_prefix_length" id="v4_pat_pool_prefix_length">
-              </div>
-              <div class="form-group">
-                <label for="v4_pat_pool_prefix">v4-pat-pool-prefix</label>
-                <input type="text" class="form-control" name="v4_pat_pool_prefix" id="v4_pat_pool_prefix">
-              </div>
-
-<!--
-              <div class="form-group">
-				<input type="hidden" name="svc_instance_id" id="svc_instance_id">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submit(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
--->
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-<script type="text/javascript">
-function submit(form){
-	$('#pat-pools-modal').modal('hide');
-	form.action = form.uf_action.value;
-	form.submit();
-	return;
-}
-</script>
-
diff --git a/admportal/views/partials/phs_credentials.ejs b/admportal/views/partials/phs_credentials.ejs
deleted file mode 100644
index 4413dcad..00000000
--- a/admportal/views/partials/phs_credentials.ejs
+++ /dev/null
@@ -1,92 +0,0 @@
-<div class="modal fade" id="add_phs_credentials" tabindex="-1" role="dialog"
-        aria-labelledby="add_phs_credentials_label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Add PHS Credentials</h4>
-          </div>
-          <div class="modal-body">
-            <form name="addForm" role="form" action="/ucpe/addPhsCredentials" method="POST">
-              <div class="form-group">
-                <label for="nf_device_vendor_name">*Device Vendor Name</label>
-                <input type="text" class="form-control" maxlength="255" aria-describedby="helpVName" name="nf_device_vendor_name" id="nf_device_vendor_name" placeholder="varchar(255)">
-				<span id="helpVName" class="help-block">The Device Vendor Name must match exactly whats in the PHS Servers table.</span>
-              </div>
-              <div class="form-group">
-                <label for="nf_customer_name">*Customer Name</label>
-                <input type="text" class="form-control" maxlength="255" aria-describedby="helpCName" name="nf_customer_name" id="nf_customer_name" placeholder="varchar(255)">
-				<span id="helpCName" class="help-block">The Customer Name must match exactly whats in the PHS Servers table.</span>
-              </div>
-              <div class="form-group">
-                <label for="nf_ip_addresses">*IP Addresses</label>
-                <input type="text" class="form-control" maxlength="40" aria-describedby="helpIP" name="nf_ip_addresses" id="nf_ip_addresses" placeholder="varchar(40)">
-				<span id="helpIP" class="help-block">The IP Addresses must match exactly whats in the PHS Servers table.</span>
-              </div>
-              <div class="form-group">
-                <label for="nf_phs_username">*PHS Username</label>
-                <input type="text" class="form-control" maxlength="255" name="nf_phs_username" id="nf_phs_username" placeholder="varchar(255)">
-              </div>
-              <div class="form-group">
-                <label for="nf_phs_password">*PHS Password</label>
-                <input type="password" class="form-control" maxlength="255" name="nf_phs_password" id="nf_phs_password" placeholder="varbinary(255)">
-              </div>
-              <div class="form-group">
-                <label for="nf_phs_password">*Confirm PHS Password</label>
-                <input type="password" class="form-control" maxlength="255" name="nf_confirm_phs_password" id="nf_confirm_phs_password" placeholder="varbinary(255)">
-              </div>
-              <div class="form-group">
-                <input type="hidden" name="nf_action" id="nf_action">
-                <button type="button" class="btn btn-primary" onclick="submitPhsCredentials(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-   <div class="modal fade" id="update_phs_credentials" tabindex="-1" role="dialog" 
-		aria-labelledby="update_phs_credentials_label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Update PHS Credentials</h4>
-          </div>
-          <div class="modal-body">
-            <form role="form" action="/ucpe/updatePhsCredentials" method="POST">
-              <div class="form-group">
-                <label for="uf_device_vendor_name">*Device Vendor Name</label>
-                <input readonly type="text" class="form-control" name="uf_device_vendor_name" id="uf_device_vendor_name">
-              </div>
-              <div class="form-group">
-                <label for="uf_customer_name">*Customer Name</label>
-                <input readonly type="text" class="form-control" name="uf_customer_name" id="uf_customer_name">
-              </div>
-              <div class="form-group">
-                <label for="uf_ip_addresses">*IP Addresses</label>
-                <input readonly type="text" class="form-control" name="uf_ip_addresses" id="uf_ip_addresses">
-              </div>
-              <div class="form-group">
-                <label for="uf_phs_username">*PHS Username</label>
-                <input type="text" class="form-control" maxlength="255" name="uf_phs_username" id="uf_phs_username">
-              </div>
-              <div class="form-group">
-                <label for="uf_phs_password">*PHS Password</label>
-                <input type="password" class="form-control" maxlength="255" name="uf_phs_password" id="uf_phs_password">
-			  </div>
-              <div class="form-group">
-                <label for="uf_phs_password">*Confirm PHS Password</label>
-                <input type="password" class="form-control" maxlength="255" name="uf_confirm_phs_password" id="uf_confirm_phs_password" placeholder="varbinary(255)">
-              </div>
-              <div class="form-group">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submitPhsCredentials(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
diff --git a/admportal/views/partials/request_information_modal.ejs b/admportal/views/partials/request_information_modal.ejs
deleted file mode 100644
index b5ee4a31..00000000
--- a/admportal/views/partials/request_information_modal.ejs
+++ /dev/null
@@ -1,60 +0,0 @@
-   <div class="modal fade" id="request-information-modal" tabindex="-1" role="dialog" aria-labelledby="request-information-modal-label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title" id="request-information-modal-label">request-information</h4>
-          </div>
-          <div class="modal-body">
-            <form id="request_information_form" role="form" action="" method="POST">
-              <div class="form-group">
-                <label for="notification_url">notification-url</label>
-                <input type="text" class="form-control" name="notification_url" id="notification_url">
-              </div>
-              <div class="form-group">
-                <label for="source">source</label>
-                <input type="text" class="form-control" name="source" id="source">
-              </div>
-              <div class="form-group">
-                <label for="order_number">order-number</label>
-                <input type="text" class="form-control" name="order_number" id="order_number">
-              </div>
-              <div class="form-group">
-                <label for="request_id">request-id</label>
-                <input type="text" class="form-control" name="request_id" id="request_id">
-              </div>
-              <div class="form-group">
-                <label for="order_version">order-version</label>
-                <input type="text" class="form-control" name="order_version" id="order_version">
-              </div>
-              <div class="form-group">
-                <label for="request_action">request-action</label>
-                <input type="text" class="form-control" name="request_action" id="request_action">
-              </div>
-              <div class="form-group">
-                <label for="request_sub_action">request-sub-action</label>
-                <input type="text" class="form-control" name="request_sub_action" id="request_sub_action">
-              </div>
-
-<!--
-              <div class="form-group">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submit(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
--->
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-<script type="text/javascript">
-function submit(form){
-	$('#service-status-modal').modal('hide');
-	form.action = form.uf_action.value;
-	form.submit();
-	return;
-}
-</script>
-
diff --git a/admportal/views/partials/resource_rule.ejs b/admportal/views/partials/resource_rule.ejs
deleted file mode 100644
index 05d0bf4e..00000000
--- a/admportal/views/partials/resource_rule.ejs
+++ /dev/null
@@ -1,118 +0,0 @@
-<div class="modal fade" id="add_resource_rule" tabindex="-1" role="dialog"
-        aria-labelledby="add_resource_rule_label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Add Resource Rule</h4>
-          </div>
-          <div class="modal-body">
-            <form name="addForm" role="form" action="/resalloc/addResourceRule" method="POST">
-              <div class="form-group">
-                <label for="nf_resource_name">*Name</label>
-                <input type="text" class="form-control" maxlength="50" name="nf_resource_name" id="nf_resource_name" placeholder="varchar(50)">
-              </div>
-              <div class="form-group">
-                <label for="nf_end_point_position">*End Point Position</label>
-                <input type="text" class="form-control" maxlength="50" name="nf_end_point_position" id="nf_end_point_position" placeholder="varchar(50)">
-              </div>
-              <div class="form-group">
-                <label for="nf_service_expression">*Service Expression</label>
-                <input type="text" class="form-control" maxlength="2000" name="nf_service_expression" id="nf_service_expression" placeholder="varchar(2000)">
-              </div>
-              <div class="form-group">
-                <label for="nf_equipment_level">*Equipment Level</label>
-                <input type="text" class="form-control" maxlength="50" name="nf_equipment_level" id="nf_equipment_level" placeholder="varchar(50)">
-              </div>
-              <div class="form-group">
-                <label for="nf_equipment_expression">*Equipment Expression</label>
-                <input type="text" class="form-control" maxlength="2000" name="nf_equipment_expression" id="nf_equipment_expression" placeholder="varchar(2000)">
-              </div>
-              <div class="form-group">
-                <label for="nf_allocation_expression">*Allocation Expression</label>
-                <input type="text" class="form-control" maxlength="2000" name="nf_allocation_expression" id="nf_allocation_expression" placeholder="varchar(2000)">
-              </div>
-              <div class="form-group">
-                <label for="nf_soft_limit_expression">*Soft Limit Expression</label>
-                <input type="text" class="form-control" maxlength="2000" name="nf_soft_limit_expression" id="nf_soft_limit_expression" placeholder="varchar(2000)">
-              </div>
-              <div class="form-group">
-                <label for="nf_hard_limit_expression">*Hard Limit Expression</label>
-                <input type="text" class="form-control" maxlength="2000" name="nf_hard_limit_expression" id="nf_hard_limit_expression" placeholder="varchar(2000)">
-              </div>
-              <div class="form-group">
-                <label for="nf_service_model">*Service Model</label>
-                <input type="text" class="form-control" maxlength="50" name="nf_service_model" id="nf_service_model" placeholder="varchar(50)">
-              </div>
-              <div class="form-group">
-                <input type="hidden" name="nf_action" id="nf_action">
-                <button type="button" class="btn btn-primary" onclick="submitResourceRule(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-   <div class="modal fade" id="update_resource_rule" tabindex="-1" role="dialog" 
-		aria-labelledby="update_resource_rule_label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Update Resource Rule</h4>
-          </div>
-          <div class="modal-body">
-            <form role="form" action="/resalloc/updateResourceRule" method="POST">
-              <div class="form-group">
-                <label for="uf_resource_rule_id">*Rule ID</label>
-                <input readonly type="text" class="form-control" name="uf_resource_rule_id" id="uf_resource_rule_id">
-              </div>
-              <div class="form-group">
-                <label for="uf_resource_name">*Name</label>
-                <input type="text" class="form-control" maxlength="50" name="uf_resource_name" id="uf_resource_name" placeholder="varchar(50)">
-              </div>
-              <div class="form-group">
-                <label for="uf_end_point_position">*End Point Position</label>
-                <input type="text" class="form-control" maxlength="50" name="uf_end_point_position" id="uf_end_point_position" placeholder="varchar(50)">
-              </div>
-              <div class="form-group">
-                <label for="uf_service_expression">*Service Expression</label>
-                <input type="text" class="form-control" maxlength="2000" name="uf_service_expression" id="uf_service_expression" placeholder="varchar(2000)">
-              </div>
-              <div class="form-group">
-                <label for="uf_equipment_level">*Equipment Level</label>
-                <input type="text" class="form-control" maxlength="50" name="uf_equipment_level" id="uf_equipment_level" placeholder="varchar(50)">
-			  </div>
-              <div class="form-group">
-                <label for="uf_equipment_expression">*Equipment Expression</label>
-                <input type="text" class="form-control" maxlength="2000" name="uf_equipment_expression" id="uf_equipment_expression" placeholder="varchar(2000)">
-			  </div>
-              <div class="form-group">
-                <label for="uf_allocation_expression">*Allocation Expression</label>
-                <input type="text" class="form-control" maxlength="2000" name="uf_allocation_expression" id="uf_allocation_expression" placeholder="varchar(2000)">
-              </div>
-              <div class="form-group">
-                <label for="uf_soft_limit_expression">*Soft Limit Expression</label>
-                <input type="text" class="form-control" maxlength="2000" name="uf_soft_limit_expression" id="uf_soft_limit_expression" placeholder="varchar(2000)">
-              </div>
-              <div class="form-group">
-                <label for="uf_hard_limit_expression">*Hard Limit Expression</label>
-                <input type="text" class="form-control" maxlength="2000" name="uf_hard_limit_expression" id="uf_hard_limit_expression" placeholder="varchar(2000)">
-              </div>
-              <div class="form-group">
-                <label for="uf_service_model">*Service Model</label>
-                <input type="text" class="form-control" maxlength="50" name="uf_service_model" id="uf_service_model" placeholder="varchar(50)">
-              </div>
-              <div class="form-group">
-				<input type="hidden" name="uf_action" id="uf_action">
-				<input type="hidden" name="uf_key_resource_rule_id" id="uf_key_resource_rule_id">
-                <button type="button" class="btn btn-primary" onclick="submitResourceRule(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
diff --git a/admportal/views/partials/ro_header.ejs b/admportal/views/partials/ro_header.ejs
deleted file mode 100644
index 2e5624a1..00000000
--- a/admportal/views/partials/ro_header.ejs
+++ /dev/null
@@ -1,43 +0,0 @@
-<!-- views/partials/header.ejs -->
-<nav class="navbar navbar-default" role="navigation">
-    <div class="container-fluid">
-
-
-		<div class="navbar-header">
-            <a class="navbar-brand" href="#">&nbsp;SDN-C AdminPortal</a>
-    	</div>
-
-        <div class="btn-toolbar" role="toolbar" aria-label="Toolbar with button groups">
-
-        <div class="btn-group" role="group">
-            <button type="button" class="btn btn-default navbar-btn" disabled>SLA</button>
-
-			<div class="btn-group" role="group">
-      			<button disabled type="button" class="btn btn-default navbar-btn dropdown-toggle" 
-					data-toggle="dropdown" aria-expanded="false">Table Initialization <span class="caret"></span></button>
-      			<ul class="dropdown-menu" role="menu">
-        			<li><a href="/gamma/getAicSite">AIC Site</a></li>
-        			<li><a href="/gamma/getAicSwitch">AIC Switch</a></li>
-        			<li><a href="/gamma/getAicAvailZone">AIC Availability Zone</a></li>
-        			<li><a href="/gamma/getVlanPool">VLAN_ID Pool</a></li>
-        			<li><a href="/gamma/getVpePool">VPE Pool</a></li>
-        			<li><a href="/gamma/getVplspePool">VPLSPE Pool</a></li>
-        			<!-- <li class="divider"></li> -->
-      			</ul>
-    		</div>
-
-            <button type="button" class="btn btn-default navbar-btn" disabled>Interfaces</button>
-            <button type="button" class="btn btn-default navbar-btn" disabled>VMs</button>
-            <button disabled type="button" class="btn btn-default navbar-btn"
-				onclick="location.assign('/odl/listWklst');">Worklist Orders</button>
-            <button type="button" class="btn btn-default navbar-btn" disabled>Connections</button>
-            <button type="button" class="btn btn-default navbar-btn" disabled>VNFs</button>
-            <button type="button" class="btn btn-default navbar-btn" disabled>VLANs</button>
-            <button disabled type="button" class="btn btn-default navbar-btn"
-				onclick="location.assign('/user/listUsers');">User Admin</button>
-            <button disabled type="button" class="btn btn-default navbar-btn"
-				onclick="location.assign('/logout');">Logout</button>
-        </div>
-        </div>
-    </div>
-</nav>
diff --git a/admportal/views/partials/roadm_mapping.ejs b/admportal/views/partials/roadm_mapping.ejs
deleted file mode 100644
index 0e3a6fbd..00000000
--- a/admportal/views/partials/roadm_mapping.ejs
+++ /dev/null
@@ -1,101 +0,0 @@
-<div class="modal fade" id="add_roadm_mapping" tabindex="-1" role="dialog"
-                aria-labelledby="add_roadm_mapping_label" aria-hidden="true">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-          <h4 class="modal-title">Add ROADM Mapping</h4>
-      </div>
-      <div class="modal-body">
-      <form name="addForm" role="form" action="/tunnel/addRoadmMapping" method="POST">
-          <div class="form-group">
-              <label for="nf_router_name">*Router Name</label>
-              <input type="text" class="form-control" name="nf_router_name" id="nf_router_name" maxlength="20" placeholder="varchar(20)">
-          </div>
-          <div class="form-group">
-              <label for="nf_roadm_name">*ROADM Name</label>
-              <input type="text" class="form-control" name="nf_roadm_name" id="nf_roadm_name" maxlength="20" placeholder="varchar(20)">
-          </div>
-          <div class="form-group">
-              <label for="nf_clli">*CLLI</label>
-              <input type="text" class="form-control" name="nf_clli" id="nf_clli" maxlength="20" placeholder="varchar(20)">
-          </div>
-          <div class="form-group">
-              <label for="nf_city_name">*City Name</label>
-              <input type="text" class="form-control" name="nf_city_name" id="nf_city_name" maxlength="80" placeholder="varchar(80)">
-          </div>
-          <div class="form-group">
-              <label for="nf_lat">*Latitude</label>
-              <input type="text" class="form-control" name="nf_lat" id="nf_lat" maxlength="20" placeholder="varchar(20)">
-          </div>
-          <div class="form-group">
-              <label for="nf_lon">*Longitude</label>
-              <input type="text" class="form-control" name="nf_lon" id="nf_lon" maxlength="20" placeholder="varchar(20)">
-          </div>
-          <div class="form-group">
-              <label for="nf_snrc">*SNRC</label>
-              <input type="text" class="form-control" name="nf_snrc" id="nf_snrc" maxlength="20" placeholder="varchar(20)">
-          </div>
-
-          <div class="form-group">
-                <input type="hidden" name="nf_action" id="nf_action">
-                <button type="button" class="btn btn-primary" onclick="saveRoadmMapping(this.form);">Save</button>
-                <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-          </div>
-       </form>
-       </div>
-    </div>
-  </div>
-</div>
-
-<div class="modal fade" id="update_roadm_mapping" tabindex="-1" role="dialog"
-        aria-labelledby="update_roadm_mapping_label" aria-hidden="true">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-          <h4 class="modal-title">Update ROADM Mapping</h4>
-      </div>
-      <div class="modal-body">
-      <form role="form" action="/tunnel/updateRoadmMapping" method="POST">
-          <div class="form-group">
-              <label for="uf_router_name">*Router Name</label>
-              <input type="text" class="form-control" name="uf_router_name" id="uf_router_name" maxlength="20" placeholder="varchar(20)">
-          </div>
-          <div class="form-group">
-              <label for="uf_roadm_name">*ROADM Name</label>
-              <input type="text" class="form-control" name="uf_roadm_name" id="uf_roadm_name" maxlength="20" placeholder="varchar(20)">
-          </div>
-          <div class="form-group">
-              <label for="uf_clli">*CLLI</label>
-              <input type="text" class="form-control" name="uf_clli" id="uf_clli" maxlength="20" placeholder="varchar(20)">
-          </div>
-          <div class="form-group">
-              <label for="uf_city_name">*City Name</label>
-              <input type="text" class="form-control" name="uf_city_name" id="uf_city_name" maxlength="80" placeholder="varchar(80)">
-          </div>
-          <div class="form-group">
-              <label for="uf_lat">*Latitude</label>
-              <input type="text" class="form-control" name="uf_lat" id="uf_lat" maxlength="20" placeholder="varchar(20)">
-          </div>
-          <div class="form-group">
-              <label for="uf_lon">*Longitude</label>
-              <input type="text" class="form-control" name="uf_lon" id="uf_lon" maxlength="20" placeholder="varchar(20)">
-          </div>
-          <div class="form-group">
-              <label for="uf_snrc">*SNRC</label>
-              <input type="text" class="form-control" name="uf_snrc" id="uf_snrc" maxlength="20" placeholder="varchar(20)">
-          </div>
-
-      <div class="form-group">
-            <input type="hidden" name="uf_action" id="uf_action">
-            <input type="hidden" name="uf_key_router_name" id="uf_key_router_name">
-            <button type="button" class="btn btn-primary" onclick="saveRoadmMapping(this.form);">Save</button>
-            <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-      </div>
-      </form>
-      </div>
-    </div>
-  </div>
-</div>
-
diff --git a/admportal/views/partials/router_master.ejs b/admportal/views/partials/router_master.ejs
deleted file mode 100644
index 9b731b4d..00000000
--- a/admportal/views/partials/router_master.ejs
+++ /dev/null
@@ -1,59 +0,0 @@
-   <div class="modal fade" id="add_router_master" tabindex="-1" role="dialog" 
-		aria-labelledby="add_router_master_label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Add Router Master</h4>
-          </div>
-          <div class="modal-body">
-            <form name="addForm" role="form" action="/tunnel/addRouterMaster" method="POST">
-              <div class="form-group">
-                <label for="nf_crs_name">*CRS Name</label>
-                <input type="text" class="form-control" name="nf_crs_name" id="nf_crs_name" maxlength="20" placeholder="varchar(20)">
-              </div>
-              <div class="form-group">
-                <label for="nf_loopback_ip">Loopback IP</label>
-                <input type="text" class="form-control" name="nf_loopback_ip" id="nf_loopback_ip" maxlength="20" placeholder="varchar(20)">
-              </div>
-              <div class="form-group">
-				<input type="hidden" name="nf_action" id="nf_action">
-				<button type="button" class="btn btn-primary" onclick="saveRouterMaster(this.form);">Save</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-<div class="modal fade" id="update_router_master" tabindex="-1" role="dialog"
-        aria-labelledby="update_router_master_label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Update Router Master</h4>
-          </div>
-          <div class="modal-body">
-            <form role="form" action="/tunnel/updateRouterMaster" method="POST">
-			  <div class="form-group">
-                <label for="uf_crs_name">*CRS Name</label>
-                <input type="text" class="form-control" name="uf_crs_name" id="uf_crs_name" maxlength="20" placeholder="varchar(20)">
-              </div>
-              <div class="form-group">
-                <label for="uf_loopback_ip">Loopback IP</label>
-                <input type="text" class="form-control" name="uf_loopback_ip" id="uf_loopback_ip" maxlength="20" placeholder="varchar(20)">
-              </div>
-              <div class="form-group">
-                <input type="hidden" name="uf_action" id="uf_action">
-                <input type="hidden" name="uf_key_crs_name" id="uf_key_crs_name">
-                <button type="button" class="btn btn-primary" onclick="saveRouterMaster(this.form);">Save</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
diff --git a/admportal/views/partials/routing_protocol.ejs b/admportal/views/partials/routing_protocol.ejs
deleted file mode 100644
index 1bd647fe..00000000
--- a/admportal/views/partials/routing_protocol.ejs
+++ /dev/null
@@ -1,38 +0,0 @@
-   <div class="modal fade" id="routing-protocol-modal" tabindex="-1" role="dialog" 
-		aria-labelledby="routing-protocol-modal-label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">routing-protocol</h4>
-          </div>
-          <div class="modal-body">
-            <form role="form" action="" method="POST">
-              <div class="form-group">
-                <label for="routing_protocol">routing-protocol</label>
-                <input type="text" class="form-control" name="routing_protocol" id="routing_protocol">
-              </div>
-
-<!--
-              <div class="form-group">
-				<input type="hidden" name="svc_instance_id" id="svc_instance_id">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submit(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
--->
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-<script type="text/javascript">
-function submit(form){
-	$('#routing-protocol-modal').modal('hide');
-	form.action = form.uf_action.value;
-	form.submit();
-	return;
-}
-</script>
-
diff --git a/admportal/views/partials/sdnc_request_header_modal.ejs b/admportal/views/partials/sdnc_request_header_modal.ejs
deleted file mode 100644
index 08ae1868..00000000
--- a/admportal/views/partials/sdnc_request_header_modal.ejs
+++ /dev/null
@@ -1,46 +0,0 @@
-   <div class="modal fade" 
-		id="sdnc-request-header-modal" tabindex="-1" role="dialog" 
-		aria-labelledby="sdnc-request-header-modal-label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title" id="sdnc-request-header-modal-label">sdnc-request-header</h4>
-          </div>
-          <div class="modal-body">
-            <form id="sdnc_request_header_form" role="form" action="" method="POST">
-              <div class="form-group">
-                <label for="svc_notification_url">svc-notification-url</label>
-                <input type="text" class="form-control" name="svc_notification_url" id="svc_notification_url">
-              </div>
-              <div class="form-group">
-                <label for="svc_request_id">svc-request-id</label>
-                <input type="text" class="form-control" name="svc_request_id" id="svc_request_id">
-              </div>
-              <div class="form-group">
-                <label for="svc_action">svc-action</label>
-                <input type="text" class="form-control" name="svc_action" id="svc_action">
-              </div>
-
-<!--
-              <div class="form-group">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submit(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
--->
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-<script type="text/javascript">
-function submit(form){
-	$('#service-status-modal').modal('hide');
-	form.action = form.uf_action.value;
-	form.submit();
-	return;
-}
-</script>
-
diff --git a/admportal/views/partials/sdnfcHeader.ejs b/admportal/views/partials/sdnfcHeader.ejs
deleted file mode 100644
index ba963abb..00000000
--- a/admportal/views/partials/sdnfcHeader.ejs
+++ /dev/null
@@ -1,61 +0,0 @@
-<title>SDN-FC AdminPortal</title>
-
-<!-- views/partials/header.ejs -->
-<nav class="navbar navbar-default" role="navigation">
-    <div class="container-fluid">
-
-
-		<div class="navbar-header">
-			<a class="navbar-brand" href="#">&nbsp;SDN-FC AdminPortal</a>
-    	</div>
-
-        <div class="btn-toolbar" role="toolbar" aria-label="Toolbar with button groups">
-
-        <div class="btn-group" role="group">
-            <button type="button" class="btn btn-default navbar-btn "
-				onclick="location.assign('/sla/listSLA');">SLA</button>
-
-			<div class="btn-group" role="group">
-      			<button type="button" class="btn btn-default navbar-btn dropdown-toggle" 
-					data-toggle="dropdown" aria-expanded="false" vlanidpool-submenu>Table Management <span class="caret"></span>
-				</button>
-      			<ul class="dropdown-menu" role="menu">
-                    <li><a href="/sdnfc/getTables">View Tables</a></li>
-        			<li class="divider"></li>
-                    <li><a href="/sdnfc/getVrrCredentials">VRR Credentials</a></li>
-                    <li><a href="/sdnfc/getBgpUpdates">BGP Updates</a></li>
-                    <li><a href="/sdnfc/getCliUpdates">CLI Updates</a></li>
-        			<li class="divider"></li>
-        			<li><a href="/admin/getParameters">Parameters</a></li>
-				</ul>
-			</div>
-
-			<div class="btn-group" role="group">
-      			<button type="button" class="btn btn-default navbar-btn dropdown-toggle" 
-					data-toggle="dropdown" 
-					aria-expanded="false">ODL  <span class="caret"></span></button>
-      			<ul class="dropdown-menu" role="menu">
-        			<li><a href="/odl/getClusterStatus">Get Cluster Status</a></li>
-				</ul>
-			</div>
-
-			<!-- LOGS -->
-			<div class="btn-group" role="group">
-      			<button type="button" class="btn btn-default navbar-btn dropdown-toggle" 
-					data-toggle="dropdown" 
-					aria-expanded="false">Logs  <span class="caret"></span></button>
-      			<ul class="dropdown-menu" role="menu">
-        			<li><a href="/logs/getUserTrace">User Trace</a></li>
-        			<li><a href="/logs/getAccessLog">Access Log</a></li>
-				</ul>
-			</div>
-
-            <button type="button" class="btn btn-default navbar-btn"
-				onclick="location.assign('/user/listUsers');">User Admin</button>
-            <button type="button" class="btn btn-default navbar-btn"
-				onclick="location.assign('/logout');">Logout</button>
-        </div>
-        </div>
-    </div>
-
-</nav>
diff --git a/admportal/views/partials/sdnmlcHeader.ejs b/admportal/views/partials/sdnmlcHeader.ejs
deleted file mode 100644
index 3dc768ff..00000000
--- a/admportal/views/partials/sdnmlcHeader.ejs
+++ /dev/null
@@ -1,63 +0,0 @@
-<title>SDNC-MLC AdminPortal</title>
-
-<!-- views/partials/header.ejs -->
-<nav class="navbar navbar-default" role="navigation">
-    <div class="container-fluid">
-
-
-		<div class="navbar-header">
-			<a class="navbar-brand" href="#">&nbsp;SDNC-MLC AdminPortal</a>
-    	</div>
-
-        <div class="btn-toolbar" role="toolbar" aria-label="Toolbar with button groups">
-
-        <div class="btn-group" role="group">
-            <button type="button" class="btn btn-default navbar-btn "
-				onclick="location.assign('/sla/listSLA');">SLA</button>
-
-			<div class="btn-group" role="group">
-      			<button type="button" class="btn btn-default navbar-btn dropdown-toggle" 
-					data-toggle="dropdown" aria-expanded="false" vlanidpool-submenu>Table Management <span class="caret"></span>
-				</button>
-      			<ul class="dropdown-menu" role="menu">
-        			<li><a href="/tunnel/getRouterMaster">Router Master</a></li>
-        			<li><a href="/tunnel/getLinkMaster">Link Master</a></li>
-        			<li><a href="/tunnel/getRoadmMapping">ROADM Mapping</a></li>
-        			<li><a href="/tunnel/getOwbcProperties">OWBC Properties</a></li>
-        			<li><a href="/tunnel/getMetroRoadmServiceRequest">Metro ROADM Service Request</a></li>
-        			<li><a href="/tunnel/getLinkLatencyMaster">Link Latency Master</a></li>
-        			<li><a href="/tunnel/getPartnerProperties">Partner Properties</a></li>
-        			<li class="divider"></li>
-        			<li><a href="/admin/getParameters">Parameters</a></li>
-				</ul>
-			</div>
-
-			<div class="btn-group" role="group">
-      			<button type="button" class="btn btn-default navbar-btn dropdown-toggle" 
-					data-toggle="dropdown" 
-					aria-expanded="false">ODL  <span class="caret"></span></button>
-      			<ul class="dropdown-menu" role="menu">
-        			<li><a href="/odl/getClusterStatus">Get Cluster Status</a></li>
-				</ul>
-			</div>
-
-			<!-- LOGS -->
-			<div class="btn-group" role="group">
-      			<button type="button" class="btn btn-default navbar-btn dropdown-toggle" 
-					data-toggle="dropdown" 
-					aria-expanded="false">Logs  <span class="caret"></span></button>
-      			<ul class="dropdown-menu" role="menu">
-        			<li><a href="/logs/getUserTrace">User Trace</a></li>
-        			<li><a href="/logs/getAccessLog">Access Log</a></li>
-				</ul>
-			</div>
-
-            <button type="button" class="btn btn-default navbar-btn"
-				onclick="location.assign('/user/listUsers');">User Admin</button>
-            <button type="button" class="btn btn-default navbar-btn"
-				onclick="location.assign('/logout');">Logout</button>
-        </div>
-        </div>
-    </div>
-
-</nav>
diff --git a/admportal/views/partials/service_information_modal.ejs b/admportal/views/partials/service_information_modal.ejs
deleted file mode 100644
index 7adf4aaf..00000000
--- a/admportal/views/partials/service_information_modal.ejs
+++ /dev/null
@@ -1,46 +0,0 @@
-   <div class="modal fade" 
-		id="service-information-modal" tabindex="-1" role="dialog" 
-		aria-labelledby="service-information-modal-label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title" id="service-information-modal-label">Service Information</h4>
-          </div>
-          <div class="modal-body">
-            <form id="service_information_form" role="form" action="" method="POST">
-              <div class="form-group">
-                <label for="service_instance_id">service-instance-id</label>
-                <input type="text" class="form-control" name="service_instance_id" id="service_instance_id">
-              </div>
-              <div class="form-group">
-                <label for="subscriber_name">subscriber-name</label>
-                <input type="text" class="form-control" name="subscriber_name" id="subscriber_name">
-              </div>
-              <div class="form-group">
-                <label for="service_type">service-type</label>
-                <input type="text" class="form-control" name="service_type" id="service_type">
-              </div>
-
-<!--
-              <div class="form-group">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submit(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
--->
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-<script type="text/javascript">
-function submit(form){
-	$('#service-status-modal').modal('hide');
-	form.action = form.uf_action.value;
-	form.submit();
-	return;
-}
-</script>
-
diff --git a/admportal/views/partials/service_manager_credentials.ejs b/admportal/views/partials/service_manager_credentials.ejs
deleted file mode 100644
index 655d1767..00000000
--- a/admportal/views/partials/service_manager_credentials.ejs
+++ /dev/null
@@ -1,65 +0,0 @@
-<div class="modal fade" id="add_service_manager_credentials" tabindex="-1" role="dialog"
-        aria-labelledby="add_service_manager_credentials_label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Add Service Manager Credentials</h4>
-          </div>
-          <div class="modal-body">
-            <form name="addForm" role="form" action="/ucpe/addServiceManagerCredentials" method="POST">
-              <div class="form-group">
-                <label for="nf_service_manager_username">*Service Manager Username</label>
-                <input type="text" class="form-control" maxlength="255" name="nf_service_manager_username" id="nf_service_manager_username" placeholder="varchar(255)">
-              </div>
-              <div class="form-group">
-                <label for="nf_service_manager_password">*Service Manager Password</label>
-                <input type="password" class="form-control" maxlength="255" name="nf_service_manager_password" id="nf_service_manager_password" placeholder="varbinary(255)">
-              </div>
-              <div class="form-group">
-                <label for="nf_confirm_service_manager_password">*Confirm Service Manager Password</label>
-                <input type="password" class="form-control" maxlength="255" name="nf_confirm_service_manager_password" id="nf_confirm_service_manager_password" placeholder="varbinary(255)">
-              </div>
-              <div class="form-group">
-                <input type="hidden" name="nf_action" id="nf_action">
-                <button type="button" class="btn btn-primary" onclick="submitServiceManagerCredentials(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-   <div class="modal fade" id="update_service_manager_credentials" tabindex="-1" role="dialog" 
-		aria-labelledby="update_service_manager_credentials_label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Update Service Manager Credentials</h4>
-          </div>
-          <div class="modal-body">
-            <form role="form" action="/ucpe/updateServiceManagerCredentials" method="POST">
-              <div class="form-group">
-                <label for="uf_service_manager_username">*Service Manager Username</label>
-                <input type="text" class="form-control" maxlength="255" name="uf_service_manager_username" id="uf_service_manager_username">
-              </div>
-              <div class="form-group">
-                <label for="uf_service_manager_password">*Service Manager Password</label>
-                <input type="password" class="form-control" maxlength="255" name="uf_service_manager_password" id="uf_service_manager_password">
-			  </div>
-              <div class="form-group">
-                <label for="uf_confirm_service_manager_password">*Confirm Service Manager Password</label>
-                <input type="password" class="form-control" maxlength="255" name="uf_confirm_service_manager_password" id="uf_confirm_service_manager_password" placeholder="varbinary(255)">
-              </div>
-              <div class="form-group">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submitServiceManagerCredentials(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
diff --git a/admportal/views/partials/service_status_modal.ejs b/admportal/views/partials/service_status_modal.ejs
deleted file mode 100644
index 8da4fcb7..00000000
--- a/admportal/views/partials/service_status_modal.ejs
+++ /dev/null
@@ -1,68 +0,0 @@
-   <div class="modal fade" id="service-status-modal" tabindex="-1" role="dialog" aria-labelledby="service-status-modal-label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title" id="service-status-modal-label">SERVICE-STATUS</h4>
-          </div>
-          <div class="modal-body">
-            <form id="service_status_form" role="form" action="" method="POST">
-              <div class="form-group">
-                <label for="rpc_name">rpc-name</label>
-                <input type="text" class="form-control" name="rpc_name" id="rpc_name">
-              </div>
-              <div class="form-group">
-                <label for="final_indicator">final-indicator</label>
-                <input type="text" class="form-control" name="final_indicator" id="final_indicator">
-              </div>
-              <div class="form-group">
-                <label for="request_status">request-status</label>
-                <input type="text" class="form-control" name="request_status" id="request_status">
-              </div>
-              <div class="form-group">
-                <label for="rpc_action">rpc-action</label>
-                <input type="text" class="form-control" name="rpc_action" id="rpc_action">
-              </div>
-              <div class="form-group">
-                <label for="l3sdn_action">l3sdn-action</label>
-                <input type="text" class="form-control" name="l3sdn_action" id="l3sdn_action">
-              </div>
-              <div class="form-group">
-                <label for="l3sdn_subaction">l3sdn-subaction</label>
-                <input type="text" class="form-control" name="l3sdn_subaction" id="l3sdn_subaction">
-              </div>
-              <div class="form-group">
-                <label for="response_message">response-message</label>
-                <input type="text" class="form-control" name="response_message" id="response_message">
-              </div>
-              <div class="form-group">
-                <label for="response_code">response-code</label>
-                <input type="text" class="form-control" name="response_code" id="response_code">
-              </div>
-              <div class="form-group">
-                <label for="response_timestamp">response-timestamp</label>
-                <input type="text" class="form-control" name="response_timestamp" id="response_timestamp">
-              </div>
-
-<!--
-			<div class="form-group">
-                                <input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submit(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
--->
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-<script type="text/javascript">
-function submit(form){
-	$('#service-status-modal').modal('hide');
-	form.action = form.uf_action.value;
-	form.submit();
-	return;
-}
-</script>
-
diff --git a/admportal/views/partials/startssl.sh b/admportal/views/partials/startssl.sh
deleted file mode 100755
index a56570e3..00000000
--- a/admportal/views/partials/startssl.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#. ./set-https-env.sh
-#cd ../bin
-#cp ../config/config.json.https ../config/config.json
-export PROJECT_HOME=/opt/openecomp/sdnc
-export PROJECT_RUNTIME_BASE=/opt/openecomp/sdnc
-#export JAVA_HOME=/usr/lib/jvm/java-7-oracle
-export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64
-export SSL_ENABLED=false
-export SDNC_CONFIG_DIR=${PROJECT_HOME}/data/properties
-export NODE_ENV=production
-export CLASSPATH=$PROJECT_HOME/admportal/lib:$CLASSPATH
-
-PATH=${PATH}:${JAVA_HOME}/bin
-
-#. ${PROJECT_HOME}/etc/default.env
-
-MAIN_MENU=`python $PROJECT_HOME/admportal/shell/getAdmPortalProp.py MainMenu | sed -e 's|['\'']||g'` 
-export MAIN_MENU
-SSL_ENABLED=`python $PROJECT_HOME/admportal/shell/getAdmPortalProp.py sslEnabled | sed -e 's|['\'']||g'` 
-export SSL_ENABLED
-
-cd ..
-node bin/www
-#if [ "true" == "${SSL_ENABLED}" ]; then
-	#pm2 startOrRestart process.https.json
-#else
-	#pm2 startOrRestart process.http.json
-#fi
diff --git a/admportal/views/partials/svc_config_additional_data.ejs b/admportal/views/partials/svc_config_additional_data.ejs
deleted file mode 100644
index 14cfd037..00000000
--- a/admportal/views/partials/svc_config_additional_data.ejs
+++ /dev/null
@@ -1,38 +0,0 @@
-   <div class="modal fade" 
-		id="svc-config-additional-data-modal" tabindex="-1" role="dialog" 
-		aria-labelledby="svc-config-additional-data-modal-label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">svc-config-additional-data</h4>
-          </div>
-          <div class="modal-body">
-            <form role="form" action="" method="POST">
-              <div class="form-group">
-                <label for="management_ip">management-ip</label>
-                <input type="text" class="form-control" name="management_ip" id="management_ip">
-              </div>
-
-<!--
-              <div class="form-group">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submit(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
--->
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-<script type="text/javascript">
-function submit(form){
-	$('#svc-config-additional-data-modal').modal('hide');
-	form.action = form.uf_action.value;
-	form.submit();
-	return;
-}
-</script>
-
diff --git a/admportal/views/partials/svc_topology_additional_data_modal.ejs b/admportal/views/partials/svc_topology_additional_data_modal.ejs
deleted file mode 100644
index 9117dd93..00000000
--- a/admportal/views/partials/svc_topology_additional_data_modal.ejs
+++ /dev/null
@@ -1,36 +0,0 @@
-   <div class="modal fade" id="svc-topology-additional-data-modal" tabindex="-1" role="dialog" aria-labelledby="svc_topology-additional-data-modal-label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title" id="svc-topology-additional-data-modal-label">Service Topology Additional Data</h4>
-          </div>
-          <div class="modal-body">
-            <form id="svc_topology_additional_data_form" role="form" action="" method="POST">
-              <div class="form-group">
-                <label for="svc_vnf_type">svc-vnf-type</label>
-                <input type="text" class="form-control" name="svc_vnf_type" id="svc_vnf_type">
-              </div>
-
-<!--
-              <div class="form-group">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submit(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
--->
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-<script type="text/javascript">
-function submit(form){
-	$('#service-status-modal').modal('hide');
-	form.action = form.uf_action.value;
-	form.submit();
-	return;
-}
-</script>
-
diff --git a/admportal/views/partials/t_provided_v4_lan_public_prefixes.ejs b/admportal/views/partials/t_provided_v4_lan_public_prefixes.ejs
deleted file mode 100644
index d7ced071..00000000
--- a/admportal/views/partials/t_provided_v4_lan_public_prefixes.ejs
+++ /dev/null
@@ -1,46 +0,0 @@
-   <div class="modal fade" id="t-provided-v4-lan-public-prefixes-modal" tabindex="-1" role="dialog" 
-		aria-labelledby="t-provided-v4-lan-public-prefixes-modal-label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">t-provided-v4-lan-public-prefixes</h4>
-          </div>
-          <div class="modal-body">
-            <form id="t_provided_form" role="form" action="" method="POST">
-              <div class="form-group">
-                <label for="request_index">request-index</label>
-                <input type="text" class="form-control" name="v4_request_index" id="v4_request_index">
-              </div>
-              <div class="form-group">
-                <label for="v4_lan_public_prefix_length">v4-lan-public-prefix-length</label>
-                <input type="text" class="form-control" name="v4_lan_public_prefix_length" id="v4_lan_public_prefix_length">
-              </div>
-              <div class="form-group">
-                <label for="v4_lan_public_prefix">v4-lan-public-prefix</label>
-                <input type="text" class="form-control" name="v4_lan_public_prefix" id="v4_lan_public_prefix">
-              </div>
-
-<!--
-              <div class="form-group">
-				<input type="hidden" name="svc_instance_id" id="svc_instance_id">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submit(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
--->
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-<script type="text/javascript">
-function submit(form){
-	$('#t-provided-v4-lan-public-prefixes-modal').modal('hide');
-	form.action = form.uf_action.value;
-	form.submit();
-	return;
-}
-</script>
-
diff --git a/admportal/views/partials/t_provided_v6_lan_public_prefixes.ejs b/admportal/views/partials/t_provided_v6_lan_public_prefixes.ejs
deleted file mode 100644
index f0443037..00000000
--- a/admportal/views/partials/t_provided_v6_lan_public_prefixes.ejs
+++ /dev/null
@@ -1,46 +0,0 @@
-   <div class="modal fade" id="t-provided-v6-lan-public-prefixes-modal" tabindex="-1" role="dialog" 
-		aria-labelledby="t-provided-v6-lan-public-prefixes-modal-label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">t-provided-v6-lan-public-prefixes</h4>
-          </div>
-          <div class="modal-body">
-            <form id="t_provided_form" role="form" action="" method="POST">
-              <div class="form-group">
-                <label for="request_index">request-index</label>
-                <input type="text" class="form-control" name="v6_request_index" id="v6_request_index">
-              </div>
-              <div class="form-group">
-                <label for="v6_lan_public_prefix_length">v6-lan-public-prefix-length</label>
-                <input type="text" class="form-control" name="v6_lan_public_prefix_length" id="v6_lan_public_prefix_length">
-              </div>
-              <div class="form-group">
-                <label for="v6_lan_public_prefix">v6-lan-public-prefix</label>
-                <input type="text" class="form-control" name="v6_lan_public_prefix" id="v6_lan_public_prefix">
-              </div>
-
-<!--
-              <div class="form-group">
-				<input type="hidden" name="svc_instance_id" id="svc_instance_id">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submit(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
--->
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-<script type="text/javascript">
-function submit(form){
-	$('#t-provided-v6-lan-public-prefixes-modal').modal('hide');
-	form.action = form.uf_action.value;
-	form.submit();
-	return;
-}
-</script>
-
diff --git a/admportal/views/partials/tcp_port_list.ejs b/admportal/views/partials/tcp_port_list.ejs
deleted file mode 100644
index efb4a430..00000000
--- a/admportal/views/partials/tcp_port_list.ejs
+++ /dev/null
@@ -1,38 +0,0 @@
-   <div class="modal fade" id="tcp-port-list-modal" tabindex="-1" role="dialog" 
-		aria-labelledby="tcp-port-list-modal-label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">tcp-port-list</h4>
-          </div>
-          <div class="modal-body">
-            <form role="form" action="" method="POST">
-              <div class="form-group">
-                <label for="tcp_port_number">port-number</label>
-                <input type="text" class="form-control" name="tcp_port_number" id="tcp_port_number">
-              </div>
-
-<!--
-              <div class="form-group">
-				<input type="hidden" name="svc_instance_id" id="svc_instance_id">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submit(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
--->
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-<script type="text/javascript">
-function submit(form){
-	$('#tcp-port-list-modal').modal('hide');
-	form.action = form.uf_action.value;
-	form.submit();
-	return;
-}
-</script>
-
diff --git a/admportal/views/partials/threshold_alarm.ejs b/admportal/views/partials/threshold_alarm.ejs
deleted file mode 100644
index f1df2ea9..00000000
--- a/admportal/views/partials/threshold_alarm.ejs
+++ /dev/null
@@ -1,71 +0,0 @@
-<div class="modal fade" id="add_threshold_alarm" tabindex="-1" role="dialog"
-        aria-labelledby="add_threshold_alarm_label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Add Threshold Alarm</h4>
-          </div>
-          <div class="modal-body">
-            <form name="addForm" role="form" action="/resalloc/addThresholdAlarm" method="POST">
-              <div class="form-group">
-                <label for="nf_resource_rule_id">*Resource Rule ID</label>
-                <input type="text" class="form-control" maxlength="20" name="nf_resource_rule_id" id="nf_resource_rule_id" placeholder="bigint(20)">
-              </div>
-              <div class="form-group">
-                <label for="nf_threshold_expression">*Threshold Expression</label>
-                <input type="text" class="form-control" maxlength="2000" name="nf_threshold_expression" id="nf_threshold_expression" placeholder="varchar(2000)">
-              </div>
-              <div class="form-group">
-                <label for="nf_threshold_message">*Threshold Message</label>
-                <input type="text" class="form-control" maxlength="500" name="nf_threshold_message" id="nf_threshold_message" placeholder="varchar(500)">
-              </div>
-              <div class="form-group">
-                <input type="hidden" name="nf_action" id="nf_action">
-                <button type="button" class="btn btn-primary" onclick="submitThresholdAlarm(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-
-   <div class="modal fade" id="update_threshold_alarm" tabindex="-1" role="dialog" 
-		aria-labelledby="threshold_alarm_label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Update Threshold Alarm</h4>
-          </div>
-          <div class="modal-body">
-            <form name="updateForm" role="form" action="/resalloc/updateThresholdAlarm" method="POST">
-              <div class="form-group">
-                <label for="uf_resource_threshold_id">*Resource Threshold ID</label>
-                <input readonly type="text" class="form-control" name="uf_resource_threshold_id" id="uf_resource_threshold_id">
-              </div>
-              <div class="form-group">
-                <label for="uf_resource_rule_id">*Resource Rule ID</label>
-                <input type="text" class="form-control" maxlength="20" name="uf_resource_rule_id" id="uf_resource_rule_id" placeholder="bigint(20)">
-              </div>
-              <div class="form-group">
-                <label for="uf_threshold_expression">*Threshold Expression</label>
-                <input type="text" class="form-control" maxlength="2000" name="uf_threshold_expression" id="uf_threshold_expression" placeholder="varchar(2000)">
-              </div>
-              <div class="form-group">
-                <label for="uf_threshold_message">*Threshold Message</label>
-                <input type="text" class="form-control" maxlength="2000" name="uf_threshold_message" id="uf_threshold_message" placeholder="varchar(2000)">
-              </div>
-              <div class="form-group">
-				<input type="hidden" name="uf_action" id="uf_action">
-				<input type="hidden" name="uf_key_resource_threshold_id" id="uf_key_resource_threshold_id">
-                <button type="button" class="btn btn-primary" onclick="submitThresholdAlarm(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
diff --git a/admportal/views/partials/udp_port_list.ejs b/admportal/views/partials/udp_port_list.ejs
deleted file mode 100644
index b4310b2d..00000000
--- a/admportal/views/partials/udp_port_list.ejs
+++ /dev/null
@@ -1,38 +0,0 @@
-   <div class="modal fade" id="udp-port-list-modal" tabindex="-1" role="dialog" 
-		aria-labelledby="udp-port-list-modal-label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">udp-port-list</h4>
-          </div>
-          <div class="modal-body">
-            <form role="form" action="" method="POST">
-              <div class="form-group">
-                <label for="udp_port_number">port-number</label>
-                <input type="text" class="form-control" name="udp_port_number" id="udp_port_number">
-              </div>
-
-<!--
-              <div class="form-group">
-				<input type="hidden" name="svc_instance_id" id="svc_instance_id">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submit(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
--->
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-<script type="text/javascript">
-function submit(form){
-	$('#udp-port-list-modal').modal('hide');
-	form.action = form.uf_action.value;
-	form.submit();
-	return;
-}
-</script>
-
diff --git a/admportal/views/partials/update_aic_avail_zone.ejs b/admportal/views/partials/update_aic_avail_zone.ejs
deleted file mode 100644
index 29528a07..00000000
--- a/admportal/views/partials/update_aic_avail_zone.ejs
+++ /dev/null
@@ -1,54 +0,0 @@
-   <div class="modal fade" id="update_aic_avail_zone_modal" tabindex="-1" role="dialog" 
-		aria-labelledby="update_aic_avail_zone_label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Update AIC Availability Zone Pool</h4>
-          </div>
-          <div class="modal-body">
-            <form role="form" action="/gamma/updateAicAvailZone" method="POST">
-              <div class="form-group">
-                <label for="uf_aic_site_id">AIC Site ID</label>
-                <input type="text" class="form-control" name="uf_aic_site_id" id="uf_aic_site_id">
-              </div>
-              <div class="form-group">
-                <label for="uf_availability_zone">Availability Zone</label>
-                <input type="text" class="form-control" name="uf_availability_zone" id="uf_availability_zone">
-              </div>
-              <div class="form-group">
-                <label for="uf_token">Token</label>
-                <input type="text" class="form-control" name="uf_token" id="uf_token">
-              </div>
-              <div class="form-group">
-                <label for="uf_service_type">Service Type</label>
-                <input type="text" class="form-control" name="uf_service_type" id="uf_service_type">
-              </div>
-              <div class="form-group">
-                <label for="uf_status">Status</label>
-                <input type="text" class="form-control" name="uf_status" id="uf_status">
-              </div>
-              <div class="form-group">
-                <label for="uf_vnf_id">VNF ID</label>
-                <input type="text" class="form-control" name="uf_vnf_id" id="uf_vnf_id">
-              </div>
-              <div class="form-group">
-                <label for="uf_vnf_type">VNF Type</label>
-                <input type="text" class="form-control" name="uf_vnf_type" id="uf_vnf_type">
-              </div>
-              <div class="form-group">
-                <label for="uf_hypervisor">Hypervisor</label>
-                <input type="text" class="form-control" name="uf_hypervisor" id="uf_hypervisor">
-              </div>
-              <div class="form-group">
-				<input type="hidden" name="uf_key_aic_site_id" id="uf_key_aic_site_id">
-				<input type="hidden" name="uf_key_availability_zone" id="uf_key_availability_zone">
-				<input type="hidden" name="uf_key_token" id="uf_key_token">
-                <button type="submit" class="btn btn-primary">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
diff --git a/admportal/views/partials/update_aic_site.ejs b/admportal/views/partials/update_aic_site.ejs
deleted file mode 100644
index ffff9dcb..00000000
--- a/admportal/views/partials/update_aic_site.ejs
+++ /dev/null
@@ -1,57 +0,0 @@
-   <div class="modal fade" id="update_aic_site_modal" tabindex="-1" role="dialog" 
-		aria-labelledby="update_aic_site_label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Update AIC Site</h4>
-          </div>
-          <div class="modal-body">
-            <form role="form" action="/gamma/updateAicSite" method="POST">
-              <div class="form-group">
-                <label for="uf_name">Name</label>
-                <input type="text" class="form-control" name="uf_name" id="uf_name">
-              </div>
-              <div class="form-group">
-                <label for="uf_aic_site_id">AIC Site ID</label>
-                <input type="text" class="form-control" name="uf_aic_site_id" id="uf_aic_site_id">
-              </div>
-              <div class="form-group">
-                <label for="uf_vcenter_url">VCenter URL</label>
-                <input type="text" class="form-control" name="uf_vcenter_url" id="uf_vcenter_url">
-              </div>
-              <div class="form-group">
-                <label for="uf_vcenter_username">VCenter User</label>
-                <input type="text" class="form-control" name="uf_vcenter_username" id="uf_vcenter_username">
-              </div>
-              <div class="form-group">
-                <label for="uf_vcenter_passwd">VCenter Password</label>
-                <input type="password" class="form-control" name="uf_vcenter_passwd" id="uf_vcenter_passwd">
-              </div>
-              <div class="form-group">
-                <label for="uf_oam_gateway_addr">OAM Gateway Address</label>
-                <input type="text" class="form-control" name="uf_oam_gateway_addr" id="uf_oam_gateway_addr">
-              </div>
-              <div class="form-group">
-                <label for="uf_city">City</label>
-                <input type="text" class="form-control" name="uf_city" id="uf_city">
-              </div>
-              <div class="form-group">
-                <label for="uf_state">State</label>
-                <input type="text" class="form-control" name="uf_state" id="uf_state">
-              </div>
-              <div class="form-group">
-                <label for="uf_operational_status">Operational Status</label>
-                <input type="text" class="form-control" name="uf_operational_status" id="uf_operational_status">
-              </div>
-              <div class="form-group">
-				<input type="hidden" name="uf_action" id="uf_action">
-				<input type="hidden" name="uf_key_aic_site_id" id="uf_key_aic_site_id">
-                <button type="submit" class="btn btn-primary">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
diff --git a/admportal/views/partials/update_aic_switch.ejs b/admportal/views/partials/update_aic_switch.ejs
deleted file mode 100644
index 31f03d52..00000000
--- a/admportal/views/partials/update_aic_switch.ejs
+++ /dev/null
@@ -1,41 +0,0 @@
-   <div class="modal fade" id="update_aic_switch_modal" tabindex="-1" role="dialog" 
-		aria-labelledby="update_aic_switch_label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Update AIC Switch</h4>
-          </div>
-          <div class="modal-body">
-            <form role="form" action="/gamma/updateAicSwitch" method="POST">
-              <div class="form-group">
-                <label for="uf_physical_network_name">Physical Network Name</label>
-                <input type="text" class="form-control" name="uf_physical_network_name" id="uf_physical_network_name">
-              </div>
-              <div class="form-group">
-                <label for="uf_switch_name">Switch Name</label>
-                <input type="text" class="form-control" name="uf_switch_name" id="uf_switch_name">
-              </div>
-              <div class="form-group">
-                <label for="uf_aic_site_id">AIC Site ID</label>
-                <input type="text" class="form-control" name="uf_aic_site_id" id="uf_aic_site_id">
-              </div>
-              <div class="form-group">
-                <label for="uf_uuid">UUID</label>
-                <input type="text" class="form-control" name="uf_uuid" id="uf_uuid">
-              </div>
-              <div class="form-group">
-                <label for="uf_availability_zone">Availability Zone</label>
-                <input type="text" class="form-control" name="uf_availability_zone" id="uf_availability_zone">
-              </div>
-              <div class="form-group">
-				<input type="hidden" name="uf_action" id="uf_action">
-				<input type="hidden" name="uf_key_physical_network_name" id="uf_key_physical_network_name">
-                <button type="submit" class="btn btn-primary">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
diff --git a/admportal/views/partials/update_max_port_speed.ejs b/admportal/views/partials/update_max_port_speed.ejs
deleted file mode 100644
index 71c4a422..00000000
--- a/admportal/views/partials/update_max_port_speed.ejs
+++ /dev/null
@@ -1,45 +0,0 @@
-   <div class="modal fade" id="update_max_port_speed" tabindex="-1" role="dialog" 
-		aria-labelledby="update_max_port_speed_label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Update Max Port Speed</h4>
-          </div>
-          <div class="modal-body">
-            <form role="form" action="/resalloc/updateMaxPortSpeed" method="POST">
-              <div class="form-group">
-                <label for="uf_max_port_speed_id">ID</label>
-                <input readonly type="text" class="form-control" name="uf_max_port_speed_id" id="uf_max_port_speed_id">
-              </div>
-              <div class="form-group">
-                <label for="uf_image_file_name">Image File Name</label>
-                <input type="text" class="form-control" maxlength="50" name="uf_image_file_name" id="uf_image_file_name">
-              </div>
-              <div class="form-group">
-                <label for="uf_end_point_position">End Point Position</label>
-                <input type="text" class="form-control" maxlength="50" name="uf_end_point_position" id="uf_end_point_position">
-              </div>
-              <div class="form-group">
-                <label for="uf_interface_name">Interface Name</label>
-                <input type="text" class="form-control" maxlength="100" name="uf_interface_name" id="uf_interface_name">
-              </div>
-              <div class="form-group">
-                <label for="uf_max_speed">Max Speed</label>
-                <input type="text" class="form-control" maxlength="50" name="uf_max_speed" id="uf_max_speed">
-			  </div>
-              <div class="form-group">
-                <label for="uf_unit">Unit</label>
-                <input type="text" class="form-control" maxlength="10" name="uf_unit" id="uf_unit">
-			  </div>
-              <div class="form-group">
-				<input type="hidden" name="uf_action" id="uf_action">
-				<input type="hidden" name="uf_key_max_port_speed_id" id="uf_key_max_port_speed_id">
-                <button type="submit" class="btn btn-primary">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
diff --git a/admportal/views/partials/update_parameter.ejs b/admportal/views/partials/update_parameter.ejs
deleted file mode 100644
index 257f657e..00000000
--- a/admportal/views/partials/update_parameter.ejs
+++ /dev/null
@@ -1,38 +0,0 @@
-   <div class="modal fade" id="update_parameter" tabindex="-1" role="dialog" 
-		aria-labelledby="parameter_label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Update Parameter</h4>
-          </div>
-          <div class="modal-body">
-            <form name="updateForm" role="form" action="/admin/updateParameter" method="POST">
-              <div class="form-group">
-                <label for="uf_name">*Name</label>
-                <input maxlength="100" type="text" class="form-control" name="uf_name" id="uf_name" placeholder="varchar(100)">
-              </div>
-              <div class="form-group">
-                <label for="uf_value">*Value</label>
-                <input maxlength="100" type="text" class="form-control" name="uf_value" id="uf_value" placeholder="varchar(100)">
-              </div>
-              <div class="form-group">
-                <label for="uf_category">Category</label>
-                <input maxlength="24" type="text" class="form-control" name="uf_category" id="uf_category" placeholder="varchar(24)">
-              </div>
-              <div class="form-group">
-                <label for="uf_memo">Memo</label>
-                <input maxlength="128" type="text" class="form-control" name="uf_memo" id="uf_memo" placeholder="varchar(128)">
-              </div>
-			  <div class="form-group">
-					<input type="hidden" name="_csrf" value="<%= privilege.csrfToken %>" />
-                  <input type="hidden" name="nf_action" id="nf_action">
-                  <input type="hidden" name="uf_key_name" id="uf_key_name">
-                  <button type="button" class="btn btn-primary" onclick="submitParam(this.form);">Submit</button>
-                  <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
diff --git a/admportal/views/partials/update_resource_rule.ejs b/admportal/views/partials/update_resource_rule.ejs
deleted file mode 100644
index 69243b23..00000000
--- a/admportal/views/partials/update_resource_rule.ejs
+++ /dev/null
@@ -1,57 +0,0 @@
-   <div class="modal fade" id="update_resource_rule" tabindex="-1" role="dialog" 
-		aria-labelledby="update_resource_rule_label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Update Resource Rule</h4>
-          </div>
-          <div class="modal-body">
-            <form role="form" action="/resalloc/updateResourceRule" method="POST">
-              <div class="form-group">
-                <label for="uf_resource_rule_id">Rule ID</label>
-                <input readonly type="text" class="form-control" name="uf_resource_rule_id" id="uf_resource_rule_id">
-              </div>
-              <div class="form-group">
-                <label for="uf_resource_name">Name</label>
-                <input type="text" class="form-control" maxlength="50" name="uf_resource_name" id="uf_resource_name">
-              </div>
-              <div class="form-group">
-                <label for="uf_end_point_position">End Point Position</label>
-                <input type="text" class="form-control" maxlength="50" name="uf_end_point_position" id="uf_end_point_position">
-              </div>
-              <div class="form-group">
-                <label for="uf_service_expression">Service Expression</label>
-                <input type="text" class="form-control" maxlength="2000" name="uf_service_expression" id="uf_service_expression">
-              </div>
-              <div class="form-group">
-                <label for="uf_equipment_level">Equipment Level</label>
-                <input type="text" class="form-control" maxlength="50" name="uf_equipment_level" id="uf_equipment_level">
-			  </div>
-              <div class="form-group">
-                <label for="uf_equipment_expression">Equipment Expression</label>
-                <input type="text" class="form-control" maxlength="2000" name="uf_equipment_expression" id="uf_equipment_expression">
-			  </div>
-              <div class="form-group">
-                <label for="uf_allocation_expression">Allocation Expression</label>
-                <input type="text" class="form-control" maxlength="2000" name="uf_allocation_expression" id="uf_allocation_expression">
-              </div>
-              <div class="form-group">
-                <label for="uf_soft_limit_expression">Soft Limit Expression</label>
-                <input type="text" class="form-control" maxlength="2000" name="uf_soft_limit_expression" id="uf_soft_limit_expression">
-              </div>
-              <div class="form-group">
-                <label for="uf_hard_limit_expression">Hard Limit Expression</label>
-                <input type="text" class="form-control" maxlength="2000" name="uf_hard_limit_expression" id="uf_hard_limit_expression">
-              </div>
-              <div class="form-group">
-				<input type="hidden" name="uf_action" id="uf_action">
-				<input type="hidden" name="uf_key_resource_rule_id" id="uf_key_resource_rule_id">
-                <button type="submit" class="btn btn-primary">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
diff --git a/admportal/views/partials/update_service_homing.ejs b/admportal/views/partials/update_service_homing.ejs
deleted file mode 100644
index 5697168b..00000000
--- a/admportal/views/partials/update_service_homing.ejs
+++ /dev/null
@@ -1,55 +0,0 @@
-   <div class="modal fade" id="update_service_homing" tabindex="-1" role="dialog" 
-		aria-labelledby="update_service_homing_label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Update Service Homing</h4>
-          </div>
-          <div class="modal-body">
-            <form name="updateForm" role="form" action="/gamma/updateServiceHoming" method="POST">
-              <div class="form-group">
-                <label for="uf_service_type">*Service Type</label>
-                <input readonly type="text" class="form-control" name="uf_service_type" id="uf_service_type">
-              </div>
-              <div class="form-group">
-                <label for="uf_lata">*LATA</label>
-                <input type="text" class="form-control" name="uf_lata" id="uf_lata" maxlength="12" placeholder="int(3)">
-              </div>
-              <div class="form-group">
-                <label for="uf_hubbing_city_type">*Hubbing City Type</label>
-                <input type="text" class="form-control" name="uf_hubbing_city_type" id="uf_hubbing_city_type" maxlength="40" placeholder="varchar(40)">
-              </div>
-              <div class="form-group">
-                <label for="uf_latitude">Latitude</label>
-                <input type="text" class="form-control" name="uf_latitude" id="uf_latitude" maxlength="24" placeholder="float">
-              </div>
-              <div class="form-group">
-                <label for="uf_longitude">Longitude</label>
-                <input type="text" class="form-control" name="uf_longitude" id="uf_longitude" maxlength="24" placeholder="float">
-			  </div>
-              <div class="form-group">
-                <label for="uf_primary_aic_site_name">*Primary Site Name</label>
-                <input type="text" class="form-control" name="uf_primary_aic_site_name" id="uf_primary_aic_site_name" maxlength="100" placeholder="varchar(100)">
-			  </div>
-              <div class="form-group">
-                <label for="uf_secondary_aic_site_name">Secondary Site Name</label>
-                <input type="text" class="form-control" name="uf_secondary_aic_site_name" id="uf_secondary_aic_site_name" maxlength="100" placeholder="varchar(100)">
-              </div>
-              <div class="form-group">
-                <label for="uf_tertiary_aic_site_name">Tertiary Site Name</label>
-                <input type="text" class="form-control" name="uf_tertiary_aic_site_name" id="uf_tertiary_aic_site_name" maxlength="100" placeholder="varchar(100)">
-              </div>
-              <div class="form-group">
-				<input type="hidden" name="uf_action" id="uf_action">
-				<input type="hidden" name="uf_key_service_type" id="uf_key_service_type">
-				<input type="hidden" name="uf_key_lata" id="uf_key_lata">
-				<input type="hidden" name="uf_key_hubbing_city_type" id="uf_key_hubbing_city_type">
-				<button type="button" class="btn btn-primary" onclick="submitServiceHoming(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
diff --git a/admportal/views/partials/update_vlan_id_pool.ejs b/admportal/views/partials/update_vlan_id_pool.ejs
deleted file mode 100644
index d010672c..00000000
--- a/admportal/views/partials/update_vlan_id_pool.ejs
+++ /dev/null
@@ -1,51 +0,0 @@
-   <div class="modal fade" id="update_vlan_id_pool_modal" tabindex="-1" role="dialog" 
-		aria-labelledby="update_vlan_id_pool_label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Update VLAN ID Pool</h4>
-          </div>
-          <div class="modal-body">
-            <form role="form" action="/gamma/updateVlanPool" method="POST">
-              <div class="form-group">
-                <label for="uf_aic_site_id">AIC Site ID</label>
-                <input type="text" class="form-control" name="uf_aic_site_id" id="uf_aic_site_id">
-              </div>
-              <div class="form-group">
-                <label for="uf_purpose">Purpose</label>
-                <input type="text" class="form-control" name="uf_purpose" id="uf_purpose">
-              </div>
-              <div class="form-group">
-                <label for="uf_vlan_id">VLAN ID</label>
-                <input type="text" class="form-control" name="uf_vlan_id" id="uf_vlan_id">
-              </div>
-              <div class="form-group">
-                <label for="uf_vplspe_name">VPLSPE Name</label>
-                <input type="text" class="form-control" name="uf_vplspe_name" id="uf_vplspe_name">
-              </div>
-              <div class="form-group">
-                <label for="uf_availability_zone">Availability Zone</label>
-                <input type="text" class="form-control" name="uf_availability_zone" id="uf_availability_zone">
-              </div>
-              <div class="form-group">
-                <label for="uf_status">Status</label>
-                <input type="text" class="form-control" name="uf_status" id="uf_status">
-              </div>
-              <div class="form-group">
-                <label for="uf_svc_instance_id">Svc Instance ID</label>
-                <input type="text" class="form-control" name="uf_svc_instance_id" id="uf_svc_instance_id">
-              </div>
-              <div class="form-group">
-				<input type="hidden" name="uf_action" id="uf_action">
-				<input type="hidden" name="uf_key_aic_site_id" id="uf_key_aic_site_id">
-				<input type="hidden" name="uf_key_purpose" id="uf_key_purpose">
-				<input type="hidden" name="uf_key_vlan_id" id="uf_key_vlan_id">
-                <button type="submit" class="btn btn-primary">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
diff --git a/admportal/views/partials/update_vpe_pool.ejs b/admportal/views/partials/update_vpe_pool.ejs
deleted file mode 100644
index c583590f..00000000
--- a/admportal/views/partials/update_vpe_pool.ejs
+++ /dev/null
@@ -1,88 +0,0 @@
-   <div class="modal fade" id="update_vpe_pool_modal" tabindex="-1" role="dialog" 
-		aria-labelledby="update_vpe_pool_label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Update VPE Pool</h4>
-          </div>
-          <div class="modal-body">
-            <form role="form" action="/gamma/updateVpePool" method="POST">
-              <div class="form-group">
-                <label for="uf_aic_site_id">AIC Site ID</label>
-                <input type="text" class="form-control" name="uf_aic_site_id" id="uf_aic_site_id">
-              </div>
-              <div class="form-group">
-                <label for="uf_vpe_name">VPE Name</label>
-                <input type="text" class="form-control" name="uf_vpe_name" id="uf_vpe_name">
-              </div>
-              <div class="form-group">
-                <label for="uf_availability_zone">Availability Zone</label>
-                <input type="text" class="form-control" name="uf_availability_zone" id="uf_availability_zone">
-              </div>
-              <div class="form-group">
-                <label for="uf_ipv4_oam_address">IPV4 OAM Address</label>
-                <input type="text" class="form-control" name="uf_ipv4_oam_address" id="uf_ipv4_oam_address">
-              </div>
-              <div class="form-group">
-                <label for="uf_loopback0_ipv4_address">Loopback IPV4 Address</label>
-                <input type="text" class="form-control" name="uf_loopback0_ipv4_address" id="uf_loopback0_ipv4_address">
-              </div>
-              <div class="form-group">
-                <label for="uf_provisioning_status">Provisioning Status</label>
-                <select class="form-control" name="uf_provisioning_status" id="uf_provisioning_status">
-                    <option value=PREPROV>PREPROV</option>
-                    <option value=NVTPROV>NVTPROV</option>
-                    <option value=PROV>PROV</option>
-                    <option value=CAPPED>CAPPED</option>
-                </select>
-              </div>
-              <div class="form-group">
-                <label for="uf_vlan_id_outer">VLAN ID Outer</label>
-                <input type="text" class="form-control" name="uf_vlan_id_outer" id="uf_vlan_id_outer">
-              </div>
-              <div class="form-group">
-                <label for="uf_vendor">Vendor</label>
-                <input type="text" class="form-control" name="uf_vendor" id="uf_vendor">
-              </div>
-              <div class="form-group">
-                <label for="uf_physical_intf_name">Interface Name</label>
-                <input type="text" class="form-control" name="uf_physical_intf_name" id="uf_physical_intf_name">
-              </div>
-              <div class="form-group">
-                <label for="uf_physical_intf_speed">Interface Speed</label>
-                <input type="text" class="form-control" name="uf_physical_intf_speed" id="uf_physical_intf_speed">
-              </div>
-              <div class="form-group">
-                <label for="uf_physical_intf_units">Interface Units</label>
-                <input type="text" class="form-control" name="uf_physical_intf_units" id="uf_physical_intf_units">
-              </div>
-              <div class="form-group">
-                <label for="uf_vpe_uuid">VPE UUID</label>
-                <input type="text" class="form-control" name="uf_vpe_uuid" id="uf_vpe_uuid">
-              </div>
-              <div class="form-group">
-                <label for="uf_as_number">AS_NUMBER</label>
-                <input type="text" class="form-control" name="uf_as_number" id="uf_as_number">
-              </div>
-              <div class="form-group">
-                <label for="uf_vpe_id">VPE ID</label>
-                <input type="text" class="form-control" name="uf_vpe_id" id="uf_vpe_id">
-              </div>
-              <div class="form-group">
-                <label for="uf_image_filename">Image Filename</label>
-                <input type="text" class="form-control" name="uf_image_filename" id="uf_image_filename">
-              </div>
-              <div class="form-group">
-                <input type="hidden" name="uf_key_vpe_name" id="uf_key_vpe_name">
-                <input type="hidden" name="uf_key_availability_zone" id="uf_key_availability_zone">
-                <input type="hidden" name="uf_key_aic_site_id" id="uf_key_aic_site_id">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="submit" class="btn btn-primary">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
diff --git a/admportal/views/partials/update_vplspe_pool.ejs b/admportal/views/partials/update_vplspe_pool.ejs
deleted file mode 100644
index eb930522..00000000
--- a/admportal/views/partials/update_vplspe_pool.ejs
+++ /dev/null
@@ -1,72 +0,0 @@
-   <div class="modal fade" id="update_vplspe_pool_modal" tabindex="-1" role="dialog" 
-		aria-labelledby="update_vplspe_pool_label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Update VPLSPE Pool</h4>
-          </div>
-          <div class="modal-body">
-            <form role="form" action="/gamma/updateVplspePool" method="POST">
-              <div class="form-group">
-                <label for="uf_vplspe_name">VPLSPE Name</label>
-                <input type="text" class="form-control" name="uf_vplspe_name" id="uf_vplspe_name">
-              </div>
-              <div class="form-group">
-                <label for="uf_aic_site_id">AIC Site ID</label>
-                <input type="text" class="form-control" name="uf_aic_site_id" id="uf_aic_site_id">
-              </div>
-              <div class="form-group">
-                <label for="uf_availability_zone">Availability Zone</label>
-                <input type="text" class="form-control" name="uf_availability_zone" id="uf_availability_zone">
-              </div>
-              <div class="form-group">
-                <label for="uf_physical_intf_name">Interface Name</label>
-                <input type="text" class="form-control" name="uf_physical_intf_name" id="uf_physical_intf_name">
-              </div>
-              <div class="form-group">
-                <label for="uf_physical_intf_speed">Interface Speed</label>
-                <input type="text" class="form-control" name="uf_physical_intf_speed" id="uf_physical_intf_speed">
-			  </div>
-              <div class="form-group">
-                <label for="uf_physical_intf_units">Interface Units</label>
-                <input type="text" class="form-control" name="uf_physical_intf_units" id="uf_physical_intf_units">
-			  </div>
-              <div class="form-group">
-                <label for="uf_loopback0_ipv4_address">Loopback IPV4 Address</label>
-                <input type="text" class="form-control" name="uf_loopback0_ipv4_address" id="uf_loopback0_ipv4_address">
-              </div>
-              <div class="form-group">
-                <label for="uf_vlan_id_outer">VLAN ID Outer</label>
-                <input type="text" class="form-control" name="uf_vlan_id_outer" id="uf_vlan_id_outer">
-              </div>
-              <div class="form-group">
-                <label for="uf_vplspe_uuid">VPLSPE UUID</label>
-                <input type="text" class="form-control" name="uf_vplspe_uuid" id="uf_vplspe_uuid">
-              </div>
-              <div class="form-group">
-                <label for="uf_image_filename">Image Filename</label>
-                <input type="text" class="form-control" name="uf_image_filename" id="uf_image_filename">
-              </div>
-              <div class="form-group">
-                <label for="uf_provisioning_status">Provisioning Status</label>
-                <input type="text" class="form-control" name="uf_provisioning_status" id="uf_provisioning_status">
-              </div>
-              <div class="form-group">
-                <label for="uf_vendor">Vendor</label>
-                <input type="text" class="form-control" name="uf_vendor" id="uf_vendor">
-              </div>
-              <div class="form-group">
-                <input type="hidden" name="uf_key_availability_zone" id="uf_key_availability_zone">
-                <input type="hidden" name="uf_key_physical_intf_name" id="uf_key_physical_intf_name">
-                <input type="hidden" name="uf_key_vplspe_name" id="uf_key_vplspe_name">
-                <input type="hidden" name="uf_key_aic_site_id" id="uf_key_aic_site_id">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="submit" class="btn btn-primary">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
diff --git a/admportal/views/partials/userform.ejs b/admportal/views/partials/userform.ejs
deleted file mode 100644
index f882c6d0..00000000
--- a/admportal/views/partials/userform.ejs
+++ /dev/null
@@ -1,42 +0,0 @@
-<div class="modal fade" id="myUserModal" tabindex="-1" role="dialog" aria-labelledby="myUserModalLabel" aria-hidden="true">
-	<div class="modal-dialog">
-		<div class="modal-content">
-			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-				<h4 class="modal-title" id="myUserModalLabel">Update User</h4>
-			</div>
-			<div class="modal-body">
-				<form id="updateForm" name="updateForm" role="form" action="/user/updateUser" method="POST">
-					<div class="form-group">
-						<label for="uf_email">Email</label>
-						<input type="email" class="form-control" name="uf_email" id="uf_email" />
-					</div>
-					<div class="form-group">
-						<label for="uf_password">Password</label>
-						<input type="password" class="form-control" name="uf_password" id="uf_password" />
-					</div>
-					<div class="form-group">
-						<label for="uf_confirm_password">Confirm Password</label>
-						<input type="password" class="form-control" name="uf_confirm_password" id="uf_confirm_password" />
-					</div>
-					<div class="form-group">
-						<label for="uf_privilege">Privilege</label>
-						<select class="form-control" name="uf_privilege" id="uf_privilege">
-							<option value=admin>Administrator</option>
-							<option value=readonly>Readonly</option>
-						</select>
-					</div>
-					<div class="form-group">
-						<input type="hidden" name="uf_action" id="uf_action" />
-						<input type="hidden" name="_csrf" value="<%= privilege.csrfToken %>" />
-						<input type="hidden" name="uf_key_email" id="uf_key_email" />
-						<button type="button" class="btn btn-primary" onclick="submitUserAdmin(this.form);">Submit</button>
-						<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-					</div>
-				</form>
-			</div>
-		</div>
-	</div>
-</div>
-
-
diff --git a/admportal/views/partials/v4_dhcp_pools.ejs b/admportal/views/partials/v4_dhcp_pools.ejs
deleted file mode 100644
index 5a67aeb1..00000000
--- a/admportal/views/partials/v4_dhcp_pools.ejs
+++ /dev/null
@@ -1,50 +0,0 @@
-   <div class="modal fade" id="v4-dhcp-pools-modal" tabindex="-1" role="dialog" 
-		aria-labelledby="v4-dhcp-pools-modal-label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">dhcp</h4>
-          </div>
-          <div class="modal-body">
-            <form role="form" action="" method="POST">
-              <div class="form-group">
-                <label for="v4_dhcp_relay_next_hop_address">v4-dhcp-relay-next-hop-address</label>
-                <input type="text" class="form-control" name="v4_dhcp_relay_next_hop_address" id="v4_dhcp_relay_next_hop_address">
-              </div>
-              <div class="form-group">
-                <label for="v4_dhcp_pool_prefix">v4-dhcp-pool-prefix</label>
-                <input type="text" class="form-control" name="v4_dhcp_pool_prefix" id="v4_dhcp_pool_prefix">
-              </div>
-              <div class="form-group">
-                <label for="v4_dhcp_pool_prefix_length">v4-dhcp-pool-prefix-length</label>
-                <input type="text" class="form-control" name="v4_dhcp_pool_prefix_length" id="v4_dhcp_pool_prefix_length">
-              </div>
-              <div class="form-group">
-                <label for="v4_dhcp_relay_gateway_address">v4-dhcp-relay-gateway-address</label>
-                <input type="text" class="form-control" name="v4_dhcp_relay_gateway_address" id="v4_dhcp_relay_gateway_address">
-              </div>
-
-<!--
-              <div class="form-group">
-				<input type="hidden" name="svc_instance_id" id="svc_instance_id">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submit(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
--->
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-<script type="text/javascript">
-function submit(form){
-	$('#v4-dhcp-pools-modal').modal('hide');
-	form.action = form.uf_action.value;
-	form.submit();
-	return;
-}
-</script>
-
diff --git a/admportal/views/partials/v4_firewall_packet_filters.ejs b/admportal/views/partials/v4_firewall_packet_filters.ejs
deleted file mode 100644
index 0b091d15..00000000
--- a/admportal/views/partials/v4_firewall_packet_filters.ejs
+++ /dev/null
@@ -1,46 +0,0 @@
-   <div class="modal fade" id="v4-firewall-packet-filters-modal" tabindex="-1" role="dialog" 
-		aria-labelledby="v4-firewall-packet-filters-modal-label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">v4-firewall-packet-filters</h4>
-          </div>
-          <div class="modal-body">
-            <form role="form" action="" method="POST">
-              <div class="form-group">
-                <label for="v4_firewall_prefix">v4-firewall-prefix</label>
-                <input type="text" class="form-control" name="v4_firewall_prefix" id="v4_firewall_prefix">
-              </div>
-              <div class="form-group">
-                <label for="v4_firewall_prefix_length">v4-firewall-prefix-length</label>
-                <input type="text" class="form-control" name="v4_firewall_prefix_length" id="v4_firewall_prefix_length">
-              </div>
-              <div class="form-group">
-                <label for="v4_allow_icmp_ping">allow-icmp-ping</label>
-                <input type="text" class="form-control" name="v4_allow_icmp_ping" id="v4_allow_icmp_ping">
-              </div>
-
-<!--
-              <div class="form-group">
-				<input type="hidden" name="svc_instance_id" id="svc_instance_id">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submit(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
--->
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-<script type="text/javascript">
-function submit(form){
-	$('#v4-firewall-packet-filters-modal').modal('hide');
-	form.action = form.uf_action.value;
-	form.submit();
-	return;
-}
-</script>
-
diff --git a/admportal/views/partials/v4_nat_mapping_entries.ejs b/admportal/views/partials/v4_nat_mapping_entries.ejs
deleted file mode 100644
index ef80022f..00000000
--- a/admportal/views/partials/v4_nat_mapping_entries.ejs
+++ /dev/null
@@ -1,46 +0,0 @@
-   <div class="modal fade" id="v4-nat-mapping-entries-modal" tabindex="-1" role="dialog" 
-		aria-labelledby="v4-nat-mapping-entries-modal-label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">v4-nat-mapping-entries</h4>
-          </div>
-          <div class="modal-body">
-            <form id="v4_nat_mapping_entries_form" role="form" action="" method="POST">
-              <div class="form-group">
-                <label for="v4_nat_external">v4-nat-external</label>
-                <input type="text" class="form-control" name="v4_nat_external" id="v4_nat_external">
-              </div>
-              <div class="form-group">
-                <label for="v4_nat_next_hop_address">v4-nat-next-hop-address</label>
-                <input type="text" class="form-control" name="v4_nat_next_hop_address" id="v4_nat_next_hop_address">
-              </div>
-              <div class="form-group">
-                <label for="v4_nat_internal">v4-nat-internal</label>
-                <input type="text" class="form-control" name="v4_nat_internal" id="v4_nat_internal">
-              </div>
-
-<!--
-              <div class="form-group">
-				<input type="hidden" name="svc_instance_id" id="svc_instance_id">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submit(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
--->
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-<script type="text/javascript">
-function submit(form){
-	$('#v4-nat-mapping-entries-modal').modal('hide');
-	form.action = form.uf_action.value;
-	form.submit();
-	return;
-}
-</script>
-
diff --git a/admportal/views/partials/v4_static_routes.ejs b/admportal/views/partials/v4_static_routes.ejs
deleted file mode 100644
index 0474dd33..00000000
--- a/admportal/views/partials/v4_static_routes.ejs
+++ /dev/null
@@ -1,46 +0,0 @@
-   <div class="modal fade" id="v4-static-routes-modal" tabindex="-1" role="dialog" 
-		aria-labelledby="v4-static-routes-modal-label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">v4-static-routes</h4>
-          </div>
-          <div class="modal-body">
-            <form id="v4_static_route_prefix_form" role="form" action="" method="POST">
-              <div class="form-group">
-                <label for="v4_static_route_prefix">v4-static-route-prefix</label>
-                <input type="text" class="form-control" name="v4_static_route_prefix" id="v4_static_route_prefix">
-              </div>
-              <div class="form-group">
-                <label for="v4_static_route_prefix_length">v4-static-route-prefix-length</label>
-                <input type="text" class="form-control" name="v4_static_route_prefix_length" id="v4_static_route_prefix_length">
-              </div>
-              <div class="form-group">
-                <label for="static_v4_next_hop_address">v4-next-hop-address</label>
-                <input type="text" class="form-control" name="static_v4_next_hop_address" id="static_v4_next_hop_address">
-              </div>
-
-<!--
-              <div class="form-group">
-				<input type="hidden" name="svc_instance_id" id="svc_instance_id">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submit(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
--->
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-<script type="text/javascript">
-function submit(form){
-	$('#v4-static-routes-modal').modal('hide');
-	form.action = form.uf_action.value;
-	form.submit();
-	return;
-}
-</script>
-
diff --git a/admportal/views/partials/v6_dhcp_pools.ejs b/admportal/views/partials/v6_dhcp_pools.ejs
deleted file mode 100644
index 7dc54abe..00000000
--- a/admportal/views/partials/v6_dhcp_pools.ejs
+++ /dev/null
@@ -1,50 +0,0 @@
-   <div class="modal fade" id="v6-dhcp-pools-modal" tabindex="-1" role="dialog" 
-		aria-labelledby="v6-dhcp-pools-modal-label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">v6-dhcp-pools</h4>
-          </div>
-          <div class="modal-body">
-            <form role="form" action="" method="POST">
-              <div class="form-group">
-                <label for="v6_dhcp_relay_next_hop_address">v6-dhcp-relay-next-hop-address</label>
-                <input type="text" class="form-control" name="v6_dhcp_relay_next_hop_address" id="v6_dhcp_relay_next_hop_address">
-              </div>
-              <div class="form-group">
-                <label for="v6_dhcp_pool_prefix">v6-dhcp-pool-prefix</label>
-                <input type="text" class="form-control" name="v6_dhcp_pool_prefix" id="v6_dhcp_pool_prefix">
-              </div>
-              <div class="form-group">
-                <label for="v6_dhcp_pool_prefix_length">v6-dhcp-pool-prefix-length</label>
-                <input type="text" class="form-control" name="v6_dhcp_pool_prefix_length" id="v6_dhcp_pool_prefix_length">
-              </div>
-              <div class="form-group">
-                <label for="v6_dhcp_relay_gateway_address">v6-dhcp-relay-gateway-address</label>
-                <input type="text" class="form-control" name="v6_dhcp_relay_gateway_address" id="v6_dhcp_relay_gateway_address">
-              </div>
-
-<!--
-              <div class="form-group">
-				<input type="hidden" name="svc_instance_id" id="svc_instance_id">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submit(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
--->
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-<script type="text/javascript">
-function submit(form){
-	$('#v6-dhcp-pools-modal').modal('hide');
-	form.action = form.uf_action.value;
-	form.submit();
-	return;
-}
-</script>
-
diff --git a/admportal/views/partials/v6_firewall_packet_filters.ejs b/admportal/views/partials/v6_firewall_packet_filters.ejs
deleted file mode 100644
index 09e2e3d5..00000000
--- a/admportal/views/partials/v6_firewall_packet_filters.ejs
+++ /dev/null
@@ -1,46 +0,0 @@
-   <div class="modal fade" id="v6-firewall-packet-filters-modal" tabindex="-1" role="dialog" 
-		aria-labelledby="v6-firewall-packet-filters-modal-label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">v6-firewall-packet-filters</h4>
-          </div>
-          <div class="modal-body">
-            <form role="form" action="" method="POST">
-              <div class="form-group">
-                <label for="v6_firewall_prefix">v6-firewall-prefix</label>
-                <input type="text" class="form-control" name="v6_firewall_prefix" id="v6_firewall_prefix">
-              </div>
-              <div class="form-group">
-                <label for="v6_firewall_prefix_length">v6-firewall-prefix-length</label>
-                <input type="text" class="form-control" name="v6_firewall_prefix_length" id="v6_firewall_prefix_length">
-              </div>
-              <div class="form-group">
-                <label for="v6_allow_icmp_ping">allow-icmp-ping</label>
-                <input type="text" class="form-control" name="v6_allow_icmp_ping" id="v6_allow_icmp_ping">
-              </div>
-
-<!--
-              <div class="form-group">
-				<input type="hidden" name="svc_instance_id" id="svc_instance_id">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submit(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
--->
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-<script type="text/javascript">
-function submit(form){
-	$('#v6-firewall-packet-filters-modal').modal('hide');
-	form.action = form.uf_action.value;
-	form.submit();
-	return;
-}
-</script>
-
diff --git a/admportal/views/partials/v6_static_routes.ejs b/admportal/views/partials/v6_static_routes.ejs
deleted file mode 100644
index bea721df..00000000
--- a/admportal/views/partials/v6_static_routes.ejs
+++ /dev/null
@@ -1,46 +0,0 @@
-   <div class="modal fade" id="v6-static-routes-modal" tabindex="-1" role="dialog" 
-		aria-labelledby="v6-static-routes-modal-label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">v6-static-routes</h4>
-          </div>
-          <div class="modal-body">
-            <form id="v6_static_route_prefix_form" role="form" action="" method="POST">
-              <div class="form-group">
-                <label for="v6_static_route_prefix">v6-static-route-prefix</label>
-                <input type="text" class="form-control" name="v6_static_route_prefix" id="v6_static_route_prefix">
-              </div>
-              <div class="form-group">
-                <label for="v6_static_route_prefix_length">v6-static-route-prefix-length</label>
-                <input type="text" class="form-control" name="v6_static_route_prefix_length" id="v6_static_route_prefix_length">
-              </div>
-              <div class="form-group">
-                <label for="static_v6_next_hop_address">v6-next-hop-address</label>
-                <input type="text" class="form-control" name="static_v6_next_hop_address" id="static_v6_next_hop_address">
-              </div>
-
-<!--
-              <div class="form-group">
-				<input type="hidden" name="svc_instance_id" id="svc_instance_id">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submit(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
--->
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-<script type="text/javascript">
-function submit(form){
-	$('#v6-static-routes-modal').modal('hide');
-	form.action = form.uf_action.value;
-	form.submit();
-	return;
-}
-</script>
-
diff --git a/admportal/views/partials/vlan.ejs b/admportal/views/partials/vlan.ejs
deleted file mode 100644
index 99cb8022..00000000
--- a/admportal/views/partials/vlan.ejs
+++ /dev/null
@@ -1,46 +0,0 @@
-   <div class="modal fade" 
-		id="vlan-modal" tabindex="-1" role="dialog" 
-		aria-labelledby="vlan-modal-label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">vlan</h4>
-          </div>
-          <div class="modal-body">
-            <form role="form" action="" method="POST">
-              <div class="form-group">
-                <label for="vlan_interface">vlan-interface</label>
-                <input type="text" class="form-control" name="vlan_interface" id="vlan_interface">
-              </div>
-              <div class="form-group">
-                <label for="vlan_id_inner">vlan-id-inner</label>
-                <input type="text" class="form-control" name="vlan_id_inner" id="vlan_id_inner">
-              </div>
-              <div class="form-group">
-                <label for="vlan_id_outer">vlan-id-outer</label>
-                <input type="text" class="form-control" name="vlan_id_outer" id="vlan_id_outer">
-              </div>
-
-<!--
-              <div class="form-group">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submit(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
--->
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-<script type="text/javascript">
-function submit(form){
-	$('#vlan-modal').modal('hide');
-	form.action = form.uf_action.value;
-	form.submit();
-	return;
-}
-</script>
-
diff --git a/admportal/views/partials/vm_networks.ejs b/admportal/views/partials/vm_networks.ejs
deleted file mode 100644
index f0f73378..00000000
--- a/admportal/views/partials/vm_networks.ejs
+++ /dev/null
@@ -1,57 +0,0 @@
-   <div class="modal fade" id="add_vm_network" tabindex="-1" role="dialog" 
-		aria-labelledby="add_vm_network" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Add VM Network</h4>
-          </div>
-          <div class="modal-body">
-            <form name="addForm" role="form" action="/mobility/addVmNetwork" method="POST">
-              <div class="form-group">
-                <label for="nf_vnf_type">*VNF Type</label>
-                <input type="text" class="form-control" name="nf_vnf_type" id="nf_vnf_type" maxlength="200" placeholder="varchar(200)">
-              </div>
-              <div class="form-group">
-                <label for="nf_vm_type">*VM Type</label>
-                <input type="text" class="form-control" name="nf_vm_type" id="nf_vm_type" maxlength="45" placeholder="varchar(45)">
-              </div>
-              <div class="form-group">
-                <label for="nf_network_role">*NETWORK ROLE</label>
-                <input maxlength="45" type="text" class="form-control" name="nf_network_role" id="nf_network_role" placeholder="varchar(45)">
-              </div>
-              <div class="form-group">
-                <label for="nf_ip_count">IP COUNT</label>
-                <input maxlength="3" type="text" class="form-control" name="nf_ip_count" id="nf_ip_count" placeholder="int(11)">
-              </div>
-              <div class="form-group">
-                <label for="nf_assign_ips">ASSIGN IPS</label>
-                <select class="form-control" name="nf_assign_ips" id="nf_assign_ips">
-					<option>true</option>
-					<option>false</option>
-				</select>
-              </div>
-              <div class="form-group">
-                <label for="nf_assign_macs">ASSIGN MACS</label>
-                <select class="form-control" name="nf_assign_macs" id="nf_assign_macs">
-					<option>true</option>
-					<option>false</option>
-				</select>
-			  </div>
-              <div class="form-group">
-                <label for="nf_assign_floating_ip">ASSIGN FLOATING IP</label>
-                <select class="form-control" name="nf_assign_floating_ip" id="nf_assign_floating_ip">
-					<option>true</option>
-					<option>false</option>
-				</select>
-			  </div>
-              <div class="form-group">
-				<input type="hidden" name="nf_action" id="nf_action">
-				<button type="button" class="btn btn-primary" onclick="addVmNetwork(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
diff --git a/admportal/views/partials/vm_profile.ejs b/admportal/views/partials/vm_profile.ejs
deleted file mode 100644
index 5c437e9e..00000000
--- a/admportal/views/partials/vm_profile.ejs
+++ /dev/null
@@ -1,32 +0,0 @@
-   <div class="modal fade" id="add_vm_profile" tabindex="-1" role="dialog" 
-		aria-labelledby="add_vm_profile" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Add VM Profile</h4>
-          </div>
-          <div class="modal-body">
-            <form name="addForm" role="form" action="/mobility/addVmProfile" method="POST">
-              <div class="form-group">
-                <label for="nf_vnf_type">*VNF Type</label>
-                <input type="text" class="form-control" name="nf_vnf_type" id="nf_vnf_type" maxlength="200" placeholder="varchar(200)">
-              </div>
-              <div class="form-group">
-                <label for="nf_vm_type">*VM Type</label>
-                <input type="text" class="form-control" name="nf_vm_type" id="nf_vm_type" maxlength="45" placeholder="varchar(45)">
-              </div>
-              <div class="form-group">
-                <label for="nf_vm_count">VM Count</label>
-                <input type="text" class="form-control" name="nf_vm_count" id="nf_vm_count" maxlength="11" placeholder="int(11)">
-              </div>
-              <div class="form-group">
-				<input type="hidden" name="nf_action" id="nf_action">
-				<button type="button" class="btn btn-primary" onclick="addVmProfile(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
diff --git a/admportal/views/partials/vnf_network.ejs b/admportal/views/partials/vnf_network.ejs
deleted file mode 100644
index 47580dc0..00000000
--- a/admportal/views/partials/vnf_network.ejs
+++ /dev/null
@@ -1,28 +0,0 @@
-   <div class="modal fade" id="add_vnf_network" tabindex="-1" role="dialog" 
-		aria-labelledby="add_vnf_network" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Add VNF Network</h4>
-          </div>
-          <div class="modal-body">
-            <form name="addForm" role="form" action="/mobility/addVnfNetwork" method="POST">
-              <div class="form-group">
-                <label for="nf_vnf_type">*VNF Type</label>
-                <input type="text" class="form-control" name="nf_vnf_type" id="nf_vnf_type" maxlength="200" placeholder="varchar(200)">
-              </div>
-              <div class="form-group">
-                <label for="nf_network_role">*Network Role</label>
-                <input type="text" class="form-control" name="nf_network_role" id="nf_network_role" maxlength="45" placeholder="varchar(45)">
-              </div>
-              <div class="form-group">
-				<input type="hidden" name="nf_action" id="nf_action">
-				<button type="button" class="btn btn-primary" onclick="addVnfNetwork(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
diff --git a/admportal/views/partials/vnf_profile.ejs b/admportal/views/partials/vnf_profile.ejs
deleted file mode 100644
index f5132191..00000000
--- a/admportal/views/partials/vnf_profile.ejs
+++ /dev/null
@@ -1,33 +0,0 @@
-   <div class="modal fade" id="add_vnf_profile" tabindex="-1" role="dialog" 
-		aria-labelledby="add_vnf_profile" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Add VNF Profile</h4>
-          </div>
-          <div class="modal-body">
-            <form name="addForm" role="form" action="/mobility/addVnfProfile" method="POST">
-              <div class="form-group">
-                <label for="nf_vnf_type">*VNF Type</label>
-                <input type="text" class="form-control" name="nf_vnf_type" id="nf_vnf_type" maxlength="200" placeholder="varchar(200)">
-              </div>
-              <div class="form-group">
-                <label for="nf_availability_zone_count">Availability Zone Count</label>
-                <input type="text" class="form-control" name="nf_availability_zone_count" id="nf_availability_zone_count" maxlength="11" placeholder="int(11)">
-              </div>
-              <div class="form-group">
-                <label for="nf_equipment_role">Equipment Role</label>
-                <input type="text" class="form-control" name="nf_equipment_role" id="nf_equipment_role" maxlength="11" placeholder="varchar(80)">
-              </div>
-              <div class="form-group">
-								<input type="hidden" name="nf_action" id="nf_action">
-								<input type="hidden" name="_csrf" value="<%= privilege.csrfToken %>" />
-								<button type="button" class="btn btn-primary" onclick="addVnfProfile(this.form);">Submit</button>
-								<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
diff --git a/admportal/views/partials/vnf_vm_information.ejs b/admportal/views/partials/vnf_vm_information.ejs
deleted file mode 100644
index fb9af735..00000000
--- a/admportal/views/partials/vnf_vm_information.ejs
+++ /dev/null
@@ -1,42 +0,0 @@
-   <div class="modal fade" 
-		id="vnf-vm-information-modal" tabindex="-1" role="dialog" 
-		aria-labelledby="vnf-vm-information-modal-label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">vnf-vm-information</h4>
-          </div>
-          <div class="modal-body">
-            <form role="form" action="" method="POST">
-              <div class="form-group">
-                <label for="vserver_type">vserver-type</label>
-                <input type="text" class="form-control" name="vserver_type" id="vserver_type">
-              </div>
-              <div class="form-group">
-                <label for="vserver_name">vserver-name</label>
-                <input type="text" class="form-control" name="vserver_name" id="vserver_name">
-              </div>
-
-<!--
-              <div class="form-group">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submit(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
--->
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-<script type="text/javascript">
-function submit(form){
-	$('#vnf-vm-information-modal').modal('hide');
-	form.action = form.uf_action.value;
-	form.submit();
-	return;
-}
-</script>
-
diff --git a/admportal/views/partials/vr_lan_interface.ejs b/admportal/views/partials/vr_lan_interface.ejs
deleted file mode 100644
index 45f7ec13..00000000
--- a/admportal/views/partials/vr_lan_interface.ejs
+++ /dev/null
@@ -1,66 +0,0 @@
-   <div class="modal fade" id="vr-lan-interface-modal" tabindex="-1" role="dialog" 
-		aria-labelledby="vr-lan-interface-modal-label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">VR-LAN-INTERFACE</h4>
-          </div>
-          <div class="modal-body">
-            <form id="vr_lan_interface_form" role="form" action="/odl/update_vr_lan_interface" method="POST">
-              <div class="form-group">
-                <label for="vr_designation">vr-designation</label>
-                <input type="text" class="form-control" name="vr_designation" id="vr_designation">
-              </div>
-              <div class="form-group">
-                <label for="v6_vr_lan_prefix">v6-vr-lan-prefix</label>
-                <input type="text" class="form-control" name="v6_vr_lan_prefix" id="v6_vr_lan_prefix">
-              </div>
-              <div class="form-group">
-                <label for="v6_vr_lan_prefix_length">v6-vr-lan-prefix-length</label>
-                <input type="text" class="form-control" name="v6_vr_lan_prefix_length" id="v6_vr_lan_prefix_length">
-              </div>
-              <div class="form-group">
-                <label for="v6_vce_wan_address">v6-vce-wan-address</label>
-                <input type="text" class="form-control" name="v6_vce_wan_address" id="v6_vce_wan_address">
-              </div>
-              <div class="form-group">
-                <label for="v4_vr_lan_prefix">v4-vr-lan-prefix</label>
-                <input type="text" class="form-control" name="v4_vr_lan_prefix" id="v4_vr_lan_prefix">
-              </div>
-              <div class="form-group">
-                <label for="v4_vr_lan_prefix_length">v4-vr-lan-prefix-length</label>
-                <input type="text" class="form-control" name="v4_vr_lan_prefix_length" id="v4_vr_lan_prefix_length">
-              </div>
-              <div class="form-group">
-                <label for="t_defaulted_v6_vrlan">t-defaulted-v6-vrlan</label>
-                <input type="text" class="form-control" name="t_defaulted_v6_vrlan" id="t_defaulted_v6_vrlan">
-              </div>
-              <div class="form-group">
-                <label for="v4_vce_loopback_address">v4-vce-loopback-address</label>
-                <input type="text" class="form-control" name="v4_vce_loopback_address" id="v4_vce_loopback_address">
-              </div>
-
-<!--
-              <div class="form-group">
-				<input type="hidden" name="svc_instance_id" id="svc_instance_id">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <button type="button" class="btn btn-primary" onclick="submit(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
--->
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-<script type="text/javascript">
-function submit(form){
-	$('#vr-lan-interface-modal').modal('hide');
-	form.action = form.uf_action.value;
-	form.submit();
-	return;
-}
-</script>
-
diff --git a/admportal/views/partials/vrr_credentials.ejs b/admportal/views/partials/vrr_credentials.ejs
deleted file mode 100644
index 620176da..00000000
--- a/admportal/views/partials/vrr_credentials.ejs
+++ /dev/null
@@ -1,82 +0,0 @@
-<div class="modal fade" id="add_vrr_credentials" tabindex="-1" role="dialog"
-        aria-labelledby="add_vrr_credentials_label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Add VRR Credentials</h4>
-          </div>
-          <div class="modal-body">
-            <form name="addForm" role="form" action="/sdnfc/addVrrCredentials" method="POST">
-              <div class="form-group">
-                <label for="nf_server_name">*Server Name</label>
-                <input type="text" class="form-control" maxlength="50" name="nf_server_name" id="nf_server_name" placeholder="varchar(50)">
-              </div>
-              <div class="form-group">
-                <label for="nf_ip_address">*IP Address</label>
-                <input type="text" class="form-control" maxlength="15" name="nf_ip_address" id="nf_ip_address" placeholder="varchar(15)">
-              </div>
-              <div class="form-group">
-                <label for="nf_username">*Username</label>
-                <input type="text" class="form-control" maxlength="50" name="nf_username" id="nf_username" placeholder="varchar(50)">
-              </div>
-              <div class="form-group">
-                <label for="nf_password">*Password</label>
-                <input type="password" class="form-control" maxlength="255" name="nf_password" id="nf_password" placeholder="varbinary(255)">
-              </div>
-              <div class="form-group">
-                <label for="nf_confirm_password">*Confirm Password</label>
-                <input type="password" class="form-control" maxlength="255" name="nf_confirm_password" id="nf_confirm_password" placeholder="varbinary(255)">
-              </div>
-              <div class="form-group">
-                <input type="hidden" name="nf_action" id="nf_action">
-                <button type="button" class="btn btn-primary" onclick="submitVrrCredentials(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-
-   <div class="modal fade" id="update_vrr_credentials" tabindex="-1" role="dialog" 
-		aria-labelledby="update_vrr_credentials_label" aria-hidden="true">
-      <div class="modal-dialog">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Update VRR Credentials</h4>
-          </div>
-          <div class="modal-body">
-            <form role="form" action="/sdnfc/updateVrrCredentials" method="POST">
-              <div class="form-group">
-                <label for="uf_server_name">*Server Name</label>
-                <input type="text" class="form-control" maxlength="50" name="uf_server_name" id="uf_server_name" placeholder="varchar(50)">
-              </div>
-              <div class="form-group">
-                <label for="uf_ip_address">*IP Address</label>
-                <input type="text" class="form-control" maxlength="15" name="uf_ip_address" id="uf_ip_address" placeholder="varchar(15)">
-              </div>
-              <div class="form-group">
-                <label for="uf_username">*Username</label>
-                <input type="text" class="form-control" maxlength="50" name="uf_username" id="uf_username" placeholder="varchar(50)">
-              </div>
-              <div class="form-group">
-                <label for="uf_password">*Password</label>
-                <input type="password" class="form-control" maxlength="255" name="uf_password" id="uf_password" placeholder="varbinary(255)">
-              </div>
-              <div class="form-group">
-                <label for="uf_confirm_password">*Confirm Password</label>
-                <input type="password" class="form-control" maxlength="255" name="uf_confirm_password" id="uf_confirm_password" placeholder="varbinary(255)">
-              </div>
-              <div class="form-group">
-				<input type="hidden" name="uf_action" id="uf_action">
-                <input type="hidden" name="uf_key_server_name" id="uf_key_server_name">
-                <button type="button" class="btn btn-primary" onclick="submitVrrCredentials(this.form);">Submit</button>
-				<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-              </div>
-           </form>
-          </div>
-      </div>
-    </div>
-  </div>
-- 
cgit 1.2.3-korg