Fix ccsdk version and remove admportal2.1.4

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
author: Dan Timoney <dtimoney@att.com> 2021-04-12 08:17:37 -0400
committer: Dan Timoney <dtimoney@att.com> 2021-04-12 08:17:37 -0400
commit: 5cabe36fe85a780a9fb808343d6341f15da13524 (patch)
tree: 4893568c164dfaa82226eacc75fec4d622acb398 /admportal/views
parent: 41a3f91544616f0e785e0e9e552e9fd0234cc9b3 (diff)
172 files changed, 0 insertions, 18237 deletions
diff --git a/admportal/views/admin/list_usertrace.ejs b/admportal/views/admin/list_usertrace.ejs
deleted file mode 100644
index 799288a7..00000000
--- a/admportal/views/admin/list_usertrace.ejs
+++ /dev/null
@@ -1,68 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="utf-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <title>SDN-C AdminPortal</title>
-</head>
-
-<body>
-
-<div class="actions" style="padding:0px 25px;">
-<h2>User Trace</h2>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-        if (result.code.length > 0) {
-            if ( result.code == 'success' ) { %>
-                <div class='alert alert-success' role='alert'><%=result.msg %></div>
-            <% } else { %>
-                <div class='alert alert-danger' role='danger'><%=result.msg %></div>
-            <% } %>
-        <% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-    <div class="actions" style="padding:15px 0px;">
-
-    </div>
-    <div class="content">
-     <table class="table table-hover">
-      <thead>
-        <tr>
-		  <th>Date</th>
-          <th>ATTUID</th>
-		  <th>Action</th>
-          <th>Description</th>
-        </tr>
-      </thead>
-      <tbody>
-    <% if (rows)  {
-         rows.forEach(function(row) { %>
-			<tr>
-            	<td><%= row.date %></td> 
-            	<td><%= row.attuid %></td> 
-            	<td><%= row.action %></td> 
-            	<td><%= row.description %></td> 
-			</tr>
-    <% }); }; %>
-      </tbody>
-    </table>
-   </div>
-
-    <footer>
-        <% include ../partials/footer %>
-    </footer>
-    
-</body>
-</html>
-
diff --git a/admportal/views/admin/parameters.ejs b/admportal/views/admin/parameters.ejs
deleted file mode 100644
index 247abc58..00000000
--- a/admportal/views/admin/parameters.ejs
+++ /dev/null
@@ -1,181 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#params').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>Parameters</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-		if (result.code.length > 0) { 
-			if ( result.code == 'success' ) { %>
-				<div class='alert alert-success' role='alert'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } else { %> 
-				<div class='alert alert-danger' role='danger'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } %>
-		<% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-
-<div class="actions" style="padding:15px 0px;">
-    <button class="btn btn-primary btn-md" data-toggle="modal" data-target="#new_parameter">
-      Add Parameter
-    </button>
-</div>
-
-	<table id="params" class="table table-hover table-condensed">
-      <thead>
-        <tr>
-          <th>*Name</th>
-          <th>*Value</th>
-          <th>Category</th>
-		  <th>Memo</th>
-		  <% if(priv == 'A'){ %>
-		  <th>Action</th>
-		  <% } %>
-        </tr>
-      </thead>
-      <tbody>
-      <% rows.forEach( function(row) { %> 
-        <tr>
-            <td><%= row.name %></td>
-            <td><%= row.value %></td>
-            <td><%= row.category %></td>
-            <td><%= row.memo %></td>
-			<% if(priv == 'A') { %>
-            <td>
-				<button type="button" class="btn btn-default btn-xs"
-                    onclick="updateParameter('<%=row.name %>','<%= row.value %>','<%= row.category %>','<%= row.memo %>');">Update</button>
-				<button type="button" class="btn btn-default btn-xs"
-                   onclick="deleteParameter('<%= row.name %>','<%=row.value %>','<%= row.category %>','<%= row.memo %>');">Delete</button>
-            </td>
-            <% } %>
-        </tr>
-    <% }); %>
-      </tbody>
-    </table>
-</div>
-
-<% include ../partials/new_parameter %>
-<% include ../partials/update_parameter %>
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-<script type="text/javascript">
-function submitParam(form)
-{
-    var errorMsg='';
-    var name = '';
-    var value = '';
-    var category = '';
-    var memo = '';
-
-    if ( form.name == 'addForm' )
-    {
-        name = form.nf_name;
-        value = form.nf_value;
-        category = form.nf_category;
-        memo = form.nf_memo;
-    }
-    else
-    {
-        name = form.uf_name;
-        value = form.uf_value;
-        category = form.uf_category;
-        memo = form.uf_memo;
-    }
-
-	if ( (name.value == null) || (name.value == "") || isblank(name.value) )
-    {
-        errorMsg += 'Name is required.<br>';
-    }
-	if ( (value.value == null) || (value.value == "") || isblank(value.value) )
-    {
-        errorMsg += 'Value is required.<br>';
-    }
-    if( errorMsg.length > 0 ) {
-        bootbox.alert(errorMsg);
-        return;
-    }
-	form.submit();
-}
-
-
-function updateParameter(name,value,category,memo) {
-
-    document.getElementById('uf_name').value=name;
-    document.getElementById('uf_value').value=value
-    document.getElementById('uf_category').value=category;
-    document.getElementById('uf_memo').value=memo;
-
-    document.getElementById('uf_key_name').value=name;
-
-    $('#update_parameter').modal('show');
-}
-
-function deleteParameter(name,value,category,memo) {
-
-	var url_string = encodeURI("/admin/deleteParameter?name=" + name
-            + "&value=" + value
-            + "&category=" + category
-			+ "&memo=" + memo);
-
-    bootbox.confirm({
-        message: "Are you sure you want to delete PARAMETER [" + name + "][" + value + "] ?",
-        callback: function(result) {
-            if ( result )
-            {
-                location.assign(url_string);
-            }
-            return;
-        },
-        buttons: {
-            cancel: {
-                label: "Cancel"
-            },
-            confirm: {
-                label: "Yes"
-            }
-        }
-    });
-}
-</script>
-
-</body>
-</html>
-
diff --git a/admportal/views/css_delete/bootstrap-theme.min.css b/admportal/views/css_delete/bootstrap-theme.min.css
deleted file mode 100644
index 4c3e7bad..00000000
--- a/admportal/views/css_delete/bootstrap-theme.min.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*!
- * Bootstrap v3.3.1 (http://getbootstrap.com)
- * Copyright 2011-2014 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */.btn-default,.btn-primary,.btn-success,.btn-info,.btn-warning,.btn-danger{text-shadow:0 -1px 0 rgba(0,0,0,.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 1px rgba(0,0,0,.075)}.btn-default:active,.btn-primary:active,.btn-success:active,.btn-info:active,.btn-warning:active,.btn-danger:active,.btn-default.active,.btn-primary.active,.btn-success.active,.btn-info.active,.btn-warning.active,.btn-danger.active{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-default .badge,.btn-primary .badge,.btn-success .badge,.btn-info .badge,.btn-warning .badge,.btn-danger .badge{text-shadow:none}.btn:active,.btn.active{background-image:none}.btn-default{text-shadow:0 1px 0 #fff;background-image:-webkit-linear-gradient(top,#fff 0,#e0e0e0 100%);background-image:-o-linear-gradient(top,#fff 0,#e0e0e0 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#e0e0e0));background-image:linear-gradient(to bottom,#fff 0,#e0e0e0 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe0e0e0', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#dbdbdb;border-color:#ccc}.btn-default:hover,.btn-default:focus{background-color:#e0e0e0;background-position:0 -15px}.btn-default:active,.btn-default.active{background-color:#e0e0e0;border-color:#dbdbdb}.btn-default:disabled,.btn-default[disabled]{background-color:#e0e0e0;background-image:none}.btn-primary{background-image:-webkit-linear-gradient(top,#337ab7 0,#265a88 100%);background-image:-o-linear-gradient(top,#337ab7 0,#265a88 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#265a88));background-image:linear-gradient(to bottom,#337ab7 0,#265a88 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff265a88', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#245580}.btn-primary:hover,.btn-primary:focus{background-color:#265a88;background-position:0 -15px}.btn-primary:active,.btn-primary.active{background-color:#265a88;border-color:#245580}.btn-primary:disabled,.btn-primary[disabled]{background-color:#265a88;background-image:none}.btn-success{background-image:-webkit-linear-gradient(top,#5cb85c 0,#419641 100%);background-image:-o-linear-gradient(top,#5cb85c 0,#419641 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#5cb85c),to(#419641));background-image:linear-gradient(to bottom,#5cb85c 0,#419641 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff419641', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#3e8f3e}.btn-success:hover,.btn-success:focus{background-color:#419641;background-position:0 -15px}.btn-success:active,.btn-success.active{background-color:#419641;border-color:#3e8f3e}.btn-success:disabled,.btn-success[disabled]{background-color:#419641;background-image:none}.btn-info{background-image:-webkit-linear-gradient(top,#5bc0de 0,#2aabd2 100%);background-image:-o-linear-gradient(top,#5bc0de 0,#2aabd2 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#5bc0de),to(#2aabd2));background-image:linear-gradient(to bottom,#5bc0de 0,#2aabd2 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2aabd2', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#28a4c9}.btn-info:hover,.btn-info:focus{background-color:#2aabd2;background-position:0 -15px}.btn-info:active,.btn-info.active{background-color:#2aabd2;border-color:#28a4c9}.btn-info:disabled,.btn-info[disabled]{background-color:#2aabd2;background-image:none}.btn-warning{background-image:-webkit-linear-gradient(top,#f0ad4e 0,#eb9316 100%);background-image:-o-linear-gradient(top,#f0ad4e 0,#eb9316 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f0ad4e),to(#eb9316));background-image:linear-gradient(to bottom,#f0ad4e 0,#eb9316 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffeb9316', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#e38d13}.btn-warning:hover,.btn-warning:focus{background-color:#eb9316;background-position:0 -15px}.btn-warning:active,.btn-warning.active{background-color:#eb9316;border-color:#e38d13}.btn-warning:disabled,.btn-warning[disabled]{background-color:#eb9316;background-image:none}.btn-danger{background-image:-webkit-linear-gradient(top,#d9534f 0,#c12e2a 100%);background-image:-o-linear-gradient(top,#d9534f 0,#c12e2a 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#d9534f),to(#c12e2a));background-image:linear-gradient(to bottom,#d9534f 0,#c12e2a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc12e2a', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#b92c28}.btn-danger:hover,.btn-danger:focus{background-color:#c12e2a;background-position:0 -15px}.btn-danger:active,.btn-danger.active{background-color:#c12e2a;border-color:#b92c28}.btn-danger:disabled,.btn-danger[disabled]{background-color:#c12e2a;background-image:none}.thumbnail,.img-thumbnail{-webkit-box-shadow:0 1px 2px rgba(0,0,0,.075);box-shadow:0 1px 2px rgba(0,0,0,.075)}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{background-color:#e8e8e8;background-image:-webkit-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:-o-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#e8e8e8));background-image:linear-gradient(to bottom,#f5f5f5 0,#e8e8e8 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);background-repeat:repeat-x}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{background-color:#2e6da4;background-image:-webkit-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-o-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#2e6da4));background-image:linear-gradient(to bottom,#337ab7 0,#2e6da4 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);background-repeat:repeat-x}.navbar-default{background-image:-webkit-linear-gradient(top,#fff 0,#f8f8f8 100%);background-image:-o-linear-gradient(top,#fff 0,#f8f8f8 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#f8f8f8));background-image:linear-gradient(to bottom,#fff 0,#f8f8f8 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff8f8f8', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 5px rgba(0,0,0,.075);box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 5px rgba(0,0,0,.075)}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.active>a{background-image:-webkit-linear-gradient(top,#dbdbdb 0,#e2e2e2 100%);background-image:-o-linear-gradient(top,#dbdbdb 0,#e2e2e2 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#dbdbdb),to(#e2e2e2));background-image:linear-gradient(to bottom,#dbdbdb 0,#e2e2e2 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdbdbdb', endColorstr='#ffe2e2e2', GradientType=0);background-repeat:repeat-x;-webkit-box-shadow:inset 0 3px 9px rgba(0,0,0,.075);box-shadow:inset 0 3px 9px rgba(0,0,0,.075)}.navbar-brand,.navbar-nav>li>a{text-shadow:0 1px 0 rgba(255,255,255,.25)}.navbar-inverse{background-image:-webkit-linear-gradient(top,#3c3c3c 0,#222 100%);background-image:-o-linear-gradient(top,#3c3c3c 0,#222 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#3c3c3c),to(#222));background-image:linear-gradient(to bottom,#3c3c3c 0,#222 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.active>a{background-image:-webkit-linear-gradient(top,#080808 0,#0f0f0f 100%);background-image:-o-linear-gradient(top,#080808 0,#0f0f0f 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#080808),to(#0f0f0f));background-image:linear-gradient(to bottom,#080808 0,#0f0f0f 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff080808', endColorstr='#ff0f0f0f', GradientType=0);background-repeat:repeat-x;-webkit-box-shadow:inset 0 3px 9px rgba(0,0,0,.25);box-shadow:inset 0 3px 9px rgba(0,0,0,.25)}.navbar-inverse .navbar-brand,.navbar-inverse .navbar-nav>li>a{text-shadow:0 -1px 0 rgba(0,0,0,.25)}.navbar-static-top,.navbar-fixed-top,.navbar-fixed-bottom{border-radius:0}@media (max-width:767px){.navbar .navbar-nav .open .dropdown-menu>.active>a,.navbar .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar .navbar-nav .open .dropdown-menu>.active>a:focus{color:#fff;background-image:-webkit-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-o-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#2e6da4));background-image:linear-gradient(to bottom,#337ab7 0,#2e6da4 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);background-repeat:repeat-x}}.alert{text-shadow:0 1px 0 rgba(255,255,255,.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 2px rgba(0,0,0,.05)}.alert-success{background-image:-webkit-linear-gradient(top,#dff0d8 0,#c8e5bc 100%);background-image:-o-linear-gradient(top,#dff0d8 0,#c8e5bc 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#dff0d8),to(#c8e5bc));background-image:linear-gradient(to bottom,#dff0d8 0,#c8e5bc 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffc8e5bc', GradientType=0);background-repeat:repeat-x;border-color:#b2dba1}.alert-info{background-image:-webkit-linear-gradient(top,#d9edf7 0,#b9def0 100%);background-image:-o-linear-gradient(top,#d9edf7 0,#b9def0 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#d9edf7),to(#b9def0));background-image:linear-gradient(to bottom,#d9edf7 0,#b9def0 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffb9def0', GradientType=0);background-repeat:repeat-x;border-color:#9acfea}.alert-warning{background-image:-webkit-linear-gradient(top,#fcf8e3 0,#f8efc0 100%);background-image:-o-linear-gradient(top,#fcf8e3 0,#f8efc0 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#fcf8e3),to(#f8efc0));background-image:linear-gradient(to bottom,#fcf8e3 0,#f8efc0 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fff8efc0', GradientType=0);background-repeat:repeat-x;border-color:#f5e79e}.alert-danger{background-image:-webkit-linear-gradient(top,#f2dede 0,#e7c3c3 100%);background-image:-o-linear-gradient(top,#f2dede 0,#e7c3c3 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f2dede),to(#e7c3c3));background-image:linear-gradient(to bottom,#f2dede 0,#e7c3c3 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffe7c3c3', GradientType=0);background-repeat:repeat-x;border-color:#dca7a7}.progress{background-image:-webkit-linear-gradient(top,#ebebeb 0,#f5f5f5 100%);background-image:-o-linear-gradient(top,#ebebeb 0,#f5f5f5 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#ebebeb),to(#f5f5f5));background-image:linear-gradient(to bottom,#ebebeb 0,#f5f5f5 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff5f5f5', GradientType=0);background-repeat:repeat-x}.progress-bar{background-image:-webkit-linear-gradient(top,#337ab7 0,#286090 100%);background-image:-o-linear-gradient(top,#337ab7 0,#286090 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#286090));background-image:linear-gradient(to bottom,#337ab7 0,#286090 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff286090', GradientType=0);background-repeat:repeat-x}.progress-bar-success{background-image:-webkit-linear-gradient(top,#5cb85c 0,#449d44 100%);background-image:-o-linear-gradient(top,#5cb85c 0,#449d44 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#5cb85c),to(#449d44));background-image:linear-gradient(to bottom,#5cb85c 0,#449d44 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0);background-repeat:repeat-x}.progress-bar-info{background-image:-webkit-linear-gradient(top,#5bc0de 0,#31b0d5 100%);background-image:-o-linear-gradient(top,#5bc0de 0,#31b0d5 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#5bc0de),to(#31b0d5));background-image:linear-gradient(to bottom,#5bc0de 0,#31b0d5 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0);background-repeat:repeat-x}.progress-bar-warning{background-image:-webkit-linear-gradient(top,#f0ad4e 0,#ec971f 100%);background-image:-o-linear-gradient(top,#f0ad4e 0,#ec971f 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f0ad4e),to(#ec971f));background-image:linear-gradient(to bottom,#f0ad4e 0,#ec971f 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0);background-repeat:repeat-x}.progress-bar-danger{background-image:-webkit-linear-gradient(top,#d9534f 0,#c9302c 100%);background-image:-o-linear-gradient(top,#d9534f 0,#c9302c 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#d9534f),to(#c9302c));background-image:linear-gradient(to bottom,#d9534f 0,#c9302c 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0);background-repeat:repeat-x}.progress-bar-striped{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.list-group{border-radius:4px;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.075);box-shadow:0 1px 2px rgba(0,0,0,.075)}.list-group-item.active,.list-group-item.active:hover,.list-group-item.active:focus{text-shadow:0 -1px 0 #286090;background-image:-webkit-linear-gradient(top,#337ab7 0,#2b669a 100%);background-image:-o-linear-gradient(top,#337ab7 0,#2b669a 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#2b669a));background-image:linear-gradient(to bottom,#337ab7 0,#2b669a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2b669a', GradientType=0);background-repeat:repeat-x;border-color:#2b669a}.list-group-item.active .badge,.list-group-item.active:hover .badge,.list-group-item.active:focus .badge{text-shadow:none}.panel{-webkit-box-shadow:0 1px 2px rgba(0,0,0,.05);box-shadow:0 1px 2px rgba(0,0,0,.05)}.panel-default>.panel-heading{background-image:-webkit-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:-o-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#e8e8e8));background-image:linear-gradient(to bottom,#f5f5f5 0,#e8e8e8 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);background-repeat:repeat-x}.panel-primary>.panel-heading{background-image:-webkit-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-o-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#2e6da4));background-image:linear-gradient(to bottom,#337ab7 0,#2e6da4 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);background-repeat:repeat-x}.panel-success>.panel-heading{background-image:-webkit-linear-gradient(top,#dff0d8 0,#d0e9c6 100%);background-image:-o-linear-gradient(top,#dff0d8 0,#d0e9c6 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#dff0d8),to(#d0e9c6));background-image:linear-gradient(to bottom,#dff0d8 0,#d0e9c6 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffd0e9c6', GradientType=0);background-repeat:repeat-x}.panel-info>.panel-heading{background-image:-webkit-linear-gradient(top,#d9edf7 0,#c4e3f3 100%);background-image:-o-linear-gradient(top,#d9edf7 0,#c4e3f3 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#d9edf7),to(#c4e3f3));background-image:linear-gradient(to bottom,#d9edf7 0,#c4e3f3 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffc4e3f3', GradientType=0);background-repeat:repeat-x}.panel-warning>.panel-heading{background-image:-webkit-linear-gradient(top,#fcf8e3 0,#faf2cc 100%);background-image:-o-linear-gradient(top,#fcf8e3 0,#faf2cc 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#fcf8e3),to(#faf2cc));background-image:linear-gradient(to bottom,#fcf8e3 0,#faf2cc 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fffaf2cc', GradientType=0);background-repeat:repeat-x}.panel-danger>.panel-heading{background-image:-webkit-linear-gradient(top,#f2dede 0,#ebcccc 100%);background-image:-o-linear-gradient(top,#f2dede 0,#ebcccc 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f2dede),to(#ebcccc));background-image:linear-gradient(to bottom,#f2dede 0,#ebcccc 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffebcccc', GradientType=0);background-repeat:repeat-x}.well{background-image:-webkit-linear-gradient(top,#e8e8e8 0,#f5f5f5 100%);background-image:-o-linear-gradient(top,#e8e8e8 0,#f5f5f5 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#e8e8e8),to(#f5f5f5));background-image:linear-gradient(to bottom,#e8e8e8 0,#f5f5f5 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8', endColorstr='#fff5f5f5', GradientType=0);background-repeat:repeat-x;border-color:#dcdcdc;-webkit-box-shadow:inset 0 1px 3px rgba(0,0,0,.05),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 3px rgba(0,0,0,.05),0 1px 0 rgba(255,255,255,.1)}
-\ No newline at end of file
diff --git a/admportal/views/css_delete/bootstrap.min.css b/admportal/views/css_delete/bootstrap.min.css
deleted file mode 100644
index b6fe4e0f..00000000
--- a/admportal/views/css_delete/bootstrap.min.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*!
- * Bootstrap v3.3.1 (http://getbootstrap.com)
- * Copyright 2011-2014 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- *//*! normalize.css v3.0.2 | MIT License | git.io/normalize */html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{margin:.67em 0;font-size:2em}mark{color:#000;background:#ff0}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{height:0;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{margin:0;font:inherit;color:inherit}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}input{line-height:normal}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid silver}legend{padding:0;border:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-spacing:0;border-collapse:collapse}td,th{padding:0}/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */@media print{*,:before,:after{color:#000!important;text-shadow:none!important;background:transparent!important;-webkit-box-shadow:none!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="#"]:after,a[href^="javascript:"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100%!important}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}select{background:#fff!important}.navbar{display:none}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered th,.table-bordered td{border:1px solid #ddd!important}}@font-face{font-family:'Glyphicons Halflings';src:url(../fonts/glyphicons-halflings-regular.eot);src:url(../fonts/glyphicons-halflings-regular.eot?#iefix) format('embedded-opentype'),url(../fonts/glyphicons-halflings-regular.woff) format('woff'),url(../fonts/glyphicons-halflings-regular.ttf) format('truetype'),url(../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular) format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-euro:before,.glyphicon-eur:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}:before,:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}input,button,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#337ab7;text-decoration:none}a:hover,a:focus{color:#23527c;text-decoration:underline}a:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.img-responsive,.thumbnail>img,.thumbnail a>img,.carousel-inner>.item>img,.carousel-inner>.item>a>img{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{display:inline-block;max-width:100%;height:auto;padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small,.h1 small,.h2 small,.h3 small,.h4 small,.h5 small,.h6 small,h1 .small,h2 .small,h3 .small,h4 .small,h5 .small,h6 .small,.h1 .small,.h2 .small,.h3 .small,.h4 .small,.h5 .small,.h6 .small{font-weight:400;line-height:1;color:#777}h1,.h1,h2,.h2,h3,.h3{margin-top:20px;margin-bottom:10px}h1 small,.h1 small,h2 small,.h2 small,h3 small,.h3 small,h1 .small,.h1 .small,h2 .small,.h2 .small,h3 .small,.h3 .small{font-size:65%}h4,.h4,h5,.h5,h6,.h6{margin-top:10px;margin-bottom:10px}h4 small,.h4 small,h5 small,.h5 small,h6 small,.h6 small,h4 .small,.h4 .small,h5 .small,.h5 .small,h6 .small,.h6 .small{font-size:75%}h1,.h1{font-size:36px}h2,.h2{font-size:30px}h3,.h3{font-size:24px}h4,.h4{font-size:18px}h5,.h5{font-size:14px}h6,.h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:300;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}small,.small{font-size:85%}mark,.mark{padding:.2em;background-color:#fcf8e3}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-lowercase{text-transform:lowercase}.text-uppercase{text-transform:uppercase}.text-capitalize{text-transform:capitalize}.text-muted{color:#777}.text-primary{color:#337ab7}a.text-primary:hover{color:#286090}.text-success{color:#3c763d}a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#337ab7}a.bg-primary:hover{background-color:#286090}.bg-success{background-color:#dff0d8}a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:hover{background-color:#e4b9b9}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ul,ol{margin-top:0;margin-bottom:10px}ul ul,ol ul,ul ol,ol ol{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;margin-left:-5px;list-style:none}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}dl{margin-top:0;margin-bottom:20px}dt,dd{line-height:1.42857143}dt{font-weight:700}dd{margin-left:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #777}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote p:last-child,blockquote ul:last-child,blockquote ol:last-child{margin-bottom:0}blockquote footer,blockquote small,blockquote .small{display:block;font-size:80%;line-height:1.42857143;color:#777}blockquote footer:before,blockquote small:before,blockquote .small:before{content:'\2014 \00A0'}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;text-align:right;border-right:5px solid #eee;border-left:0}.blockquote-reverse footer:before,blockquote.pull-right footer:before,.blockquote-reverse small:before,blockquote.pull-right small:before,.blockquote-reverse .small:before,blockquote.pull-right .small:before{content:''}.blockquote-reverse footer:after,blockquote.pull-right footer:after,.blockquote-reverse small:after,blockquote.pull-right small:after,.blockquote-reverse .small:after,blockquote.pull-right .small:after{content:'\00A0 \2014'}address{margin-bottom:20px;font-style:normal;line-height:1.42857143}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;border-radius:4px}kbd{padding:2px 4px;font-size:90%;color:#fff;background-color:#333;border-radius:3px;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.25);box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)}kbd kbd{padding:0;font-size:100%;font-weight:700;-webkit-box-shadow:none;box-shadow:none}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857143;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.row{margin-right:-15px;margin-left:-15px}.col-xs-1,.col-sm-1,.col-md-1,.col-lg-1,.col-xs-2,.col-sm-2,.col-md-2,.col-lg-2,.col-xs-3,.col-sm-3,.col-md-3,.col-lg-3,.col-xs-4,.col-sm-4,.col-md-4,.col-lg-4,.col-xs-5,.col-sm-5,.col-md-5,.col-lg-5,.col-xs-6,.col-sm-6,.col-md-6,.col-lg-6,.col-xs-7,.col-sm-7,.col-md-7,.col-lg-7,.col-xs-8,.col-sm-8,.col-md-8,.col-lg-8,.col-xs-9,.col-sm-9,.col-md-9,.col-lg-9,.col-xs-10,.col-sm-10,.col-md-10,.col-lg-10,.col-xs-11,.col-sm-11,.col-md-11,.col-lg-11,.col-xs-12,.col-sm-12,.col-md-12,.col-lg-12{position:relative;min-height:1px;padding-right:15px;padding-left:15px}.col-xs-1,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9,.col-xs-10,.col-xs-11,.col-xs-12{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:auto}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:auto}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.col-sm-1,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-10,.col-sm-11,.col-sm-12{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:auto}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:auto}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.col-md-1,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-md-10,.col-md-11,.col-md-12{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:auto}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:83.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.col-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:auto}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.col-lg-1,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-10,.col-lg-11,.col-lg-12{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:auto}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg-push-0{left:auto}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0}}table{background-color:transparent}caption{padding-top:8px;padding-bottom:8px;color:#777;text-align:left}th{text-align:left}.table{width:100%;max-width:100%;margin-bottom:20px}.table>thead>tr>th,.table>tbody>tr>th,.table>tfoot>tr>th,.table>thead>tr>td,.table>tbody>tr>td,.table>tfoot>tr>td{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>th,.table>caption+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>td,.table>thead:first-child>tr:first-child>td{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>thead>tr>th,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>tbody>tr>td,.table-condensed>tfoot>tr>td{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>tbody>tr>td,.table-bordered>tfoot>tr>td{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>thead>tr>td{border-bottom-width:2px}.table-striped>tbody>tr:nth-child(odd){background-color:#f9f9f9}.table-hover>tbody>tr:hover{background-color:#f5f5f5}table col[class*=col-]{position:static;display:table-column;float:none}table td[class*=col-],table th[class*=col-]{position:static;display:table-cell;float:none}.table>thead>tr>td.active,.table>tbody>tr>td.active,.table>tfoot>tr>td.active,.table>thead>tr>th.active,.table>tbody>tr>th.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>tbody>tr.active>td,.table>tfoot>tr.active>td,.table>thead>tr.active>th,.table>tbody>tr.active>th,.table>tfoot>tr.active>th{background-color:#f5f5f5}.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover,.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr:hover>.active,.table-hover>tbody>tr.active:hover>th{background-color:#e8e8e8}.table>thead>tr>td.success,.table>tbody>tr>td.success,.table>tfoot>tr>td.success,.table>thead>tr>th.success,.table>tbody>tr>th.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>tbody>tr.success>td,.table>tfoot>tr.success>td,.table>thead>tr.success>th,.table>tbody>tr.success>th,.table>tfoot>tr.success>th{background-color:#dff0d8}.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover,.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr:hover>.success,.table-hover>tbody>tr.success:hover>th{background-color:#d0e9c6}.table>thead>tr>td.info,.table>tbody>tr>td.info,.table>tfoot>tr>td.info,.table>thead>tr>th.info,.table>tbody>tr>th.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>tbody>tr.info>td,.table>tfoot>tr.info>td,.table>thead>tr.info>th,.table>tbody>tr.info>th,.table>tfoot>tr.info>th{background-color:#d9edf7}.table-hover>tbody>tr>td.info:hover,.table-hover>tbody>tr>th.info:hover,.table-hover>tbody>tr.info:hover>td,.table-hover>tbody>tr:hover>.info,.table-hover>tbody>tr.info:hover>th{background-color:#c4e3f3}.table>thead>tr>td.warning,.table>tbody>tr>td.warning,.table>tfoot>tr>td.warning,.table>thead>tr>th.warning,.table>tbody>tr>th.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>tbody>tr.warning>td,.table>tfoot>tr.warning>td,.table>thead>tr.warning>th,.table>tbody>tr.warning>th,.table>tfoot>tr.warning>th{background-color:#fcf8e3}.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover,.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr:hover>.warning,.table-hover>tbody>tr.warning:hover>th{background-color:#faf2cc}.table>thead>tr>td.danger,.table>tbody>tr>td.danger,.table>tfoot>tr>td.danger,.table>thead>tr>th.danger,.table>tbody>tr>th.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>tbody>tr.danger>td,.table>tfoot>tr.danger>td,.table>thead>tr.danger>th,.table>tbody>tr.danger>th,.table>tfoot>tr.danger>th{background-color:#f2dede}.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover,.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr:hover>.danger,.table-hover>tbody>tr.danger:hover>th{background-color:#ebcccc}.table-responsive{min-height:.01%;overflow-x:auto}@media screen and (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>thead>tr>th,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tfoot>tr>td{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>thead>tr>th:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0}.table-responsive>.table-bordered>thead>tr>th:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>th,.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>td{border-bottom:0}}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;max-width:100%;margin-bottom:5px;font-weight:700}input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type=radio],input[type=checkbox]{margin:4px 0 0;margin-top:1px \9;line-height:normal}input[type=file]{display:block}input[type=range]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type=file]:focus,input[type=radio]:focus,input[type=checkbox]:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{display:block;padding-top:7px;font-size:14px;line-height:1.42857143;color:#555}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857143;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{cursor:not-allowed;background-color:#eee;opacity:1}textarea.form-control{height:auto}input[type=search]{-webkit-appearance:none}@media screen and (-webkit-min-device-pixel-ratio:0){input[type=date],input[type=time],input[type=datetime-local],input[type=month]{line-height:34px}input[type=date].input-sm,input[type=time].input-sm,input[type=datetime-local].input-sm,input[type=month].input-sm{line-height:30px}input[type=date].input-lg,input[type=time].input-lg,input[type=datetime-local].input-lg,input[type=month].input-lg{line-height:46px}}.form-group{margin-bottom:15px}.radio,.checkbox{position:relative;display:block;margin-top:10px;margin-bottom:10px}.radio label,.checkbox label{min-height:20px;padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer}.radio input[type=radio],.radio-inline input[type=radio],.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox]{position:absolute;margin-top:4px \9;margin-left:-20px}.radio+.radio,.checkbox+.checkbox{margin-top:-5px}.radio-inline,.checkbox-inline{display:inline-block;padding-left:20px;margin-bottom:0;font-weight:400;vertical-align:middle;cursor:pointer}.radio-inline+.radio-inline,.checkbox-inline+.checkbox-inline{margin-top:0;margin-left:10px}input[type=radio][disabled],input[type=checkbox][disabled],input[type=radio].disabled,input[type=checkbox].disabled,fieldset[disabled] input[type=radio],fieldset[disabled] input[type=checkbox]{cursor:not-allowed}.radio-inline.disabled,.checkbox-inline.disabled,fieldset[disabled] .radio-inline,fieldset[disabled] .checkbox-inline{cursor:not-allowed}.radio.disabled label,.checkbox.disabled label,fieldset[disabled] .radio label,fieldset[disabled] .checkbox label{cursor:not-allowed}.form-control-static{padding-top:7px;padding-bottom:7px;margin-bottom:0}.form-control-static.input-lg,.form-control-static.input-sm{padding-right:0;padding-left:0}.input-sm,.form-group-sm .form-control{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm,select.form-group-sm .form-control{height:30px;line-height:30px}textarea.input-sm,textarea.form-group-sm .form-control,select[multiple].input-sm,select[multiple].form-group-sm .form-control{height:auto}.input-lg,.form-group-lg .form-control{height:46px;padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}select.input-lg,select.form-group-lg .form-control{height:46px;line-height:46px}textarea.input-lg,textarea.form-group-lg .form-control,select[multiple].input-lg,select[multiple].form-group-lg .form-control{height:auto}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.form-control-feedback{position:absolute;top:0;right:0;z-index:2;display:block;width:34px;height:34px;line-height:34px;text-align:center;pointer-events:none}.input-lg+.form-control-feedback{width:46px;height:46px;line-height:46px}.input-sm+.form-control-feedback{width:30px;height:30px;line-height:30px}.has-success .help-block,.has-success .control-label,.has-success .radio,.has-success .checkbox,.has-success .radio-inline,.has-success .checkbox-inline,.has-success.radio label,.has-success.checkbox label,.has-success.radio-inline label,.has-success.checkbox-inline label{color:#3c763d}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;background-color:#dff0d8;border-color:#3c763d}.has-success .form-control-feedback{color:#3c763d}.has-warning .help-block,.has-warning .control-label,.has-warning .radio,.has-warning .checkbox,.has-warning .radio-inline,.has-warning .checkbox-inline,.has-warning.radio label,.has-warning.checkbox label,.has-warning.radio-inline label,.has-warning.checkbox-inline label{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;background-color:#fcf8e3;border-color:#8a6d3b}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .help-block,.has-error .control-label,.has-error .radio,.has-error .checkbox,.has-error .radio-inline,.has-error .checkbox-inline,.has-error.radio label,.has-error.checkbox label,.has-error.radio-inline label,.has-error.checkbox-inline label{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;background-color:#f2dede;border-color:#a94442}.has-error .form-control-feedback{color:#a94442}.has-feedback label~.form-control-feedback{top:25px}.has-feedback label.sr-only~.form-control-feedback{top:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-static{display:inline-block}.form-inline .input-group{display:inline-table;vertical-align:middle}.form-inline .input-group .input-group-addon,.form-inline .input-group .input-group-btn,.form-inline .input-group .form-control{width:auto}.form-inline .input-group>.form-control{width:100%}.form-inline .control-label{margin-bottom:0;vertical-align:middle}.form-inline .radio,.form-inline .checkbox{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.form-inline .radio label,.form-inline .checkbox label{padding-left:0}.form-inline .radio input[type=radio],.form-inline .checkbox input[type=checkbox]{position:relative;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .radio,.form-horizontal .checkbox,.form-horizontal .radio-inline,.form-horizontal .checkbox-inline{padding-top:7px;margin-top:0;margin-bottom:0}.form-horizontal .radio,.form-horizontal .checkbox{min-height:27px}.form-horizontal .form-group{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.form-horizontal .control-label{padding-top:7px;margin-bottom:0;text-align:right}}.form-horizontal .has-feedback .form-control-feedback{right:15px}@media (min-width:768px){.form-horizontal .form-group-lg .control-label{padding-top:14.3px}}@media (min-width:768px){.form-horizontal .form-group-sm .control-label{padding-top:6px}}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:400;line-height:1.42857143;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-image:none;border:1px solid transparent;border-radius:4px}.btn:focus,.btn:active:focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn.active.focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn:hover,.btn:focus,.btn.focus{color:#333;text-decoration:none}.btn:active,.btn.active{background-image:none;outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{pointer-events:none;cursor:not-allowed;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none;opacity:.65}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default:hover,.btn-default:focus,.btn-default.focus,.btn-default:active,.btn-default.active,.open>.dropdown-toggle.btn-default{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default:active,.btn-default.active,.open>.dropdown-toggle.btn-default{background-image:none}.btn-default.disabled,.btn-default[disabled],fieldset[disabled] .btn-default,.btn-default.disabled:hover,.btn-default[disabled]:hover,fieldset[disabled] .btn-default:hover,.btn-default.disabled:focus,.btn-default[disabled]:focus,fieldset[disabled] .btn-default:focus,.btn-default.disabled.focus,.btn-default[disabled].focus,fieldset[disabled] .btn-default.focus,.btn-default.disabled:active,.btn-default[disabled]:active,fieldset[disabled] .btn-default:active,.btn-default.disabled.active,.btn-default[disabled].active,fieldset[disabled] .btn-default.active{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#337ab7;border-color:#2e6da4}.btn-primary:hover,.btn-primary:focus,.btn-primary.focus,.btn-primary:active,.btn-primary.active,.open>.dropdown-toggle.btn-primary{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary:active,.btn-primary.active,.open>.dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled,.btn-primary[disabled],fieldset[disabled] .btn-primary,.btn-primary.disabled:hover,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary:hover,.btn-primary.disabled:focus,.btn-primary[disabled]:focus,fieldset[disabled] .btn-primary:focus,.btn-primary.disabled.focus,.btn-primary[disabled].focus,fieldset[disabled] .btn-primary.focus,.btn-primary.disabled:active,.btn-primary[disabled]:active,fieldset[disabled] .btn-primary:active,.btn-primary.disabled.active,.btn-primary[disabled].active,fieldset[disabled] .btn-primary.active{background-color:#337ab7;border-color:#2e6da4}.btn-primary .badge{color:#337ab7;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success:hover,.btn-success:focus,.btn-success.focus,.btn-success:active,.btn-success.active,.open>.dropdown-toggle.btn-success{color:#fff;background-color:#449d44;border-color:#398439}.btn-success:active,.btn-success.active,.open>.dropdown-toggle.btn-success{background-image:none}.btn-success.disabled,.btn-success[disabled],fieldset[disabled] .btn-success,.btn-success.disabled:hover,.btn-success[disabled]:hover,fieldset[disabled] .btn-success:hover,.btn-success.disabled:focus,.btn-success[disabled]:focus,fieldset[disabled] .btn-success:focus,.btn-success.disabled.focus,.btn-success[disabled].focus,fieldset[disabled] .btn-success.focus,.btn-success.disabled:active,.btn-success[disabled]:active,fieldset[disabled] .btn-success:active,.btn-success.disabled.active,.btn-success[disabled].active,fieldset[disabled] .btn-success.active{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info:hover,.btn-info:focus,.btn-info.focus,.btn-info:active,.btn-info.active,.open>.dropdown-toggle.btn-info{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info:active,.btn-info.active,.open>.dropdown-toggle.btn-info{background-image:none}.btn-info.disabled,.btn-info[disabled],fieldset[disabled] .btn-info,.btn-info.disabled:hover,.btn-info[disabled]:hover,fieldset[disabled] .btn-info:hover,.btn-info.disabled:focus,.btn-info[disabled]:focus,fieldset[disabled] .btn-info:focus,.btn-info.disabled.focus,.btn-info[disabled].focus,fieldset[disabled] .btn-info.focus,.btn-info.disabled:active,.btn-info[disabled]:active,fieldset[disabled] .btn-info:active,.btn-info.disabled.active,.btn-info[disabled].active,fieldset[disabled] .btn-info.active{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning:hover,.btn-warning:focus,.btn-warning.focus,.btn-warning:active,.btn-warning.active,.open>.dropdown-toggle.btn-warning{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning:active,.btn-warning.active,.open>.dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled,.btn-warning[disabled],fieldset[disabled] .btn-warning,.btn-warning.disabled:hover,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning:hover,.btn-warning.disabled:focus,.btn-warning[disabled]:focus,fieldset[disabled] .btn-warning:focus,.btn-warning.disabled.focus,.btn-warning[disabled].focus,fieldset[disabled] .btn-warning.focus,.btn-warning.disabled:active,.btn-warning[disabled]:active,fieldset[disabled] .btn-warning:active,.btn-warning.disabled.active,.btn-warning[disabled].active,fieldset[disabled] .btn-warning.active{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger:hover,.btn-danger:focus,.btn-danger.focus,.btn-danger:active,.btn-danger.active,.open>.dropdown-toggle.btn-danger{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger:active,.btn-danger.active,.open>.dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled,.btn-danger[disabled],fieldset[disabled] .btn-danger,.btn-danger.disabled:hover,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger:hover,.btn-danger.disabled:focus,.btn-danger[disabled]:focus,fieldset[disabled] .btn-danger:focus,.btn-danger.disabled.focus,.btn-danger[disabled].focus,fieldset[disabled] .btn-danger.focus,.btn-danger.disabled:active,.btn-danger[disabled]:active,fieldset[disabled] .btn-danger:active,.btn-danger.disabled.active,.btn-danger[disabled].active,fieldset[disabled] .btn-danger.active{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{font-weight:400;color:#337ab7;border-radius:0}.btn-link,.btn-link:active,.btn-link.active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:hover,.btn-link:focus,.btn-link:active{border-color:transparent}.btn-link:hover,.btn-link:focus{color:#23527c;text-decoration:underline;background-color:transparent}.btn-link[disabled]:hover,fieldset[disabled] .btn-link:hover,.btn-link[disabled]:focus,fieldset[disabled] .btn-link:focus{color:#777;text-decoration:none}.btn-lg,.btn-group-lg>.btn{padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}.btn-sm,.btn-group-sm>.btn{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-xs,.btn-group-xs>.btn{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:5px}input[type=submit].btn-block,input[type=reset].btn-block,input[type=button].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none;visibility:hidden}.collapse.in{display:block;visibility:visible}tr.collapse.in{display:table-row}tbody.collapse.in{display:table-row-group}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition-timing-function:ease;-o-transition-timing-function:ease;transition-timing-function:ease;-webkit-transition-duration:.35s;-o-transition-duration:.35s;transition-duration:.35s;-webkit-transition-property:height,visibility;-o-transition-property:height,visibility;transition-property:height,visibility}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px solid;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;text-align:left;list-style:none;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;color:#333;white-space:nowrap}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{color:#262626;text-decoration:none;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{color:#fff;text-decoration:none;background-color:#337ab7;outline:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{color:#777}.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-right{right:0;left:auto}.dropdown-menu-left{right:auto;left:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.42857143;color:#777;white-space:nowrap}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{content:"";border-top:0;border-bottom:4px solid}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px}@media (min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}.navbar-right .dropdown-menu-left{right:auto;left:0}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group>.btn,.btn-group-vertical>.btn{position:relative;float:left}.btn-group>.btn:hover,.btn-group-vertical>.btn:hover,.btn-group>.btn:focus,.btn-group-vertical>.btn:focus,.btn-group>.btn:active,.btn-group-vertical>.btn:active,.btn-group>.btn.active,.btn-group-vertical>.btn.active{z-index:2}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child>.btn:last-child,.btn-group>.btn-group:first-child>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child>.btn:first-child{border-top-left-radius:0;border-bottom-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-left-radius:0;border-top-right-radius:0;border-bottom-left-radius:4px}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-top-right-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{display:table-cell;float:none;width:1%}.btn-group-justified>.btn-group .btn{width:100%}.btn-group-justified>.btn-group .dropdown-menu{left:auto}[data-toggle=buttons]>.btn input[type=radio],[data-toggle=buttons]>.btn-group>.btn input[type=radio],[data-toggle=buttons]>.btn input[type=checkbox],[data-toggle=buttons]>.btn-group>.btn input[type=checkbox]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*=col-]{float:none;padding-right:0;padding-left:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn,select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn,select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn{height:auto}.input-group-addon,.input-group-btn,.input-group .form-control{display:table-cell}.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child),.input-group .form-control:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:400;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type=radio],.input-group-addon input[type=checkbox]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle),.input-group-btn:last-child>.btn-group:not(:last-child)>.btn{border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:first-child>.btn-group:not(:first-child)>.btn{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:hover,.input-group-btn>.btn:focus,.input-group-btn>.btn:active{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{margin-left:-1px}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:hover,.nav>li>a:focus{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#777}.nav>li.disabled>a:hover,.nav>li.disabled>a:focus{color:#777;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:hover,.nav .open>a:focus{background-color:#eee;border-color:#337ab7}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:hover,.nav-pills>li.active>a:focus{color:#fff;background-color:#337ab7}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:hover,.nav-tabs-justified>.active>a:focus{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:hover,.nav-tabs-justified>.active>a:focus{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none;visibility:hidden}.tab-content>.active{display:block;visibility:visible}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}@media (min-width:768px){.navbar{border-radius:4px}}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{padding-right:15px;padding-left:15px;overflow-x:visible;-webkit-overflow-scrolling:touch;border-top:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1)}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;-webkit-box-shadow:none;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important;visibility:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse,.navbar-fixed-bottom .navbar-collapse{padding-right:0;padding-left:0}}.navbar-fixed-top .navbar-collapse,.navbar-fixed-bottom .navbar-collapse{max-height:340px}@media (max-device-width:480px) and (orientation:landscape){.navbar-fixed-top .navbar-collapse,.navbar-fixed-bottom .navbar-collapse{max-height:200px}}.container>.navbar-header,.container-fluid>.navbar-header,.container>.navbar-collapse,.container-fluid>.navbar-collapse{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.container>.navbar-header,.container-fluid>.navbar-header,.container>.navbar-collapse,.container-fluid>.navbar-collapse{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030}@media (min-width:768px){.navbar-fixed-top,.navbar-fixed-bottom{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;height:50px;padding:15px 15px;font-size:18px;line-height:20px}.navbar-brand:hover,.navbar-brand:focus{text-decoration:none}.navbar-brand>img{display:block}@media (min-width:768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;padding:9px 10px;margin-top:8px;margin-right:15px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:0}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;-webkit-box-shadow:none;box-shadow:none}.navbar-nav .open .dropdown-menu>li>a,.navbar-nav .open .dropdown-menu .dropdown-header{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:hover,.navbar-nav .open .dropdown-menu>li>a:focus{background-image:none}}@media (min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}.navbar-form{padding:10px 15px;margin-top:8px;margin-right:-15px;margin-bottom:8px;margin-left:-15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1)}@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .form-control-static{display:inline-block}.navbar-form .input-group{display:inline-table;vertical-align:middle}.navbar-form .input-group .input-group-addon,.navbar-form .input-group .input-group-btn,.navbar-form .input-group .form-control{width:auto}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{margin-bottom:0;vertical-align:middle}.navbar-form .radio,.navbar-form .checkbox{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.navbar-form .radio label,.navbar-form .checkbox label{padding-left:0}.navbar-form .radio input[type=radio],.navbar-form .checkbox input[type=checkbox]{position:relative;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}.navbar-form .form-group:last-child{margin-bottom:0}}@media (min-width:768px){.navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-left-radius:0;border-top-right-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){.navbar-text{float:left;margin-right:15px;margin-left:15px}}@media (min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important;margin-right:-15px}.navbar-right~.navbar-right{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:hover,.navbar-default .navbar-brand:focus{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:hover,.navbar-default .navbar-nav>li>a:focus{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:hover,.navbar-default .navbar-nav>.active>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:hover,.navbar-default .navbar-nav>.disabled>a:focus{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:hover,.navbar-default .navbar-toggle:focus{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:hover,.navbar-default .navbar-nav>.open>a:focus{color:#555;background-color:#e7e7e7}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-default .btn-link{color:#777}.navbar-default .btn-link:hover,.navbar-default .btn-link:focus{color:#333}.navbar-default .btn-link[disabled]:hover,fieldset[disabled] .navbar-default .btn-link:hover,.navbar-default .btn-link[disabled]:focus,fieldset[disabled] .navbar-default .btn-link:focus{color:#ccc}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#9d9d9d}.navbar-inverse .navbar-brand:hover,.navbar-inverse .navbar-brand:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a:hover,.navbar-inverse .navbar-nav>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:hover,.navbar-inverse .navbar-nav>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:hover,.navbar-inverse .navbar-nav>.disabled>a:focus{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:hover,.navbar-inverse .navbar-toggle:focus{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:hover,.navbar-inverse .navbar-nav>.open>a:focus{color:#fff;background-color:#080808}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#9d9d9d}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-inverse .btn-link{color:#9d9d9d}.navbar-inverse .btn-link:hover,.navbar-inverse .btn-link:focus{color:#fff}.navbar-inverse .btn-link[disabled]:hover,fieldset[disabled] .navbar-inverse .btn-link:hover,.navbar-inverse .btn-link[disabled]:focus,fieldset[disabled] .navbar-inverse .btn-link:focus{color:#444}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"}.breadcrumb>.active{color:#777}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.42857143;color:#337ab7;text-decoration:none;background-color:#fff;border:1px solid #ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-top-left-radius:4px;border-bottom-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>li>a:hover,.pagination>li>span:hover,.pagination>li>a:focus,.pagination>li>span:focus{color:#23527c;background-color:#eee;border-color:#ddd}.pagination>.active>a,.pagination>.active>span,.pagination>.active>a:hover,.pagination>.active>span:hover,.pagination>.active>a:focus,.pagination>.active>span:focus{z-index:2;color:#fff;cursor:default;background-color:#337ab7;border-color:#337ab7}.pagination>.disabled>span,.pagination>.disabled>span:hover,.pagination>.disabled>span:focus,.pagination>.disabled>a,.pagination>.disabled>a:hover,.pagination>.disabled>a:focus{color:#777;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-top-left-radius:6px;border-bottom-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-top-left-radius:3px;border-bottom-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:hover,.pager li>a:focus{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:hover,.pager .disabled>a:focus,.pager .disabled>span{color:#777;cursor:not-allowed;background-color:#fff}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}a.label:hover,a.label:focus{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#777}.label-default[href]:hover,.label-default[href]:focus{background-color:#5e5e5e}.label-primary{background-color:#337ab7}.label-primary[href]:hover,.label-primary[href]:focus{background-color:#286090}.label-success{background-color:#5cb85c}.label-success[href]:hover,.label-success[href]:focus{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:hover,.label-info[href]:focus{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:hover,.label-warning[href]:focus{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:hover,.label-danger[href]:focus{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;background-color:#777;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-xs .badge{top:0;padding:1px 5px}a.badge:hover,a.badge:focus{color:#fff;text-decoration:none;cursor:pointer}.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#337ab7;background-color:#fff}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding:30px 15px;margin-bottom:30px;color:inherit;background-color:#eee}.jumbotron h1,.jumbotron .h1{color:inherit}.jumbotron p{margin-bottom:15px;font-size:21px;font-weight:200}.jumbotron>hr{border-top-color:#d5d5d5}.container .jumbotron,.container-fluid .jumbotron{border-radius:6px}.jumbotron .container{max-width:100%}@media screen and (min-width:768px){.jumbotron{padding:48px 0}.container .jumbotron,.container-fluid .jumbotron{padding-right:60px;padding-left:60px}.jumbotron h1,.jumbotron .h1{font-size:63px}}.thumbnail{display:block;padding:4px;margin-bottom:20px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:border .2s ease-in-out;-o-transition:border .2s ease-in-out;transition:border .2s ease-in-out}.thumbnail>img,.thumbnail a>img{margin-right:auto;margin-left:auto}a.thumbnail:hover,a.thumbnail:focus,a.thumbnail.active{border-color:#337ab7}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:700}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable,.alert-dismissible{padding-right:35px}.alert-dismissable .close,.alert-dismissible .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#337ab7;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress-striped .progress-bar,.progress-bar-striped{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;background-size:40px 40px}.progress.active .progress-bar,.progress-bar.active{-webkit-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.media{margin-top:15px}.media:first-child{margin-top:0}.media-right,.media>.pull-right{padding-left:10px}.media-left,.media>.pull-left{padding-right:10px}.media-left,.media-right,.media-body{display:table-cell;vertical-align:top}.media-middle{vertical-align:middle}.media-bottom{vertical-align:bottom}.media-heading{margin-top:0;margin-bottom:5px}.media-list{padding-left:0;list-style:none}.list-group{padding-left:0;margin-bottom:20px}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-left-radius:4px;border-top-right-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}a.list-group-item{color:#555}a.list-group-item .list-group-item-heading{color:#333}a.list-group-item:hover,a.list-group-item:focus{color:#555;text-decoration:none;background-color:#f5f5f5}.list-group-item.disabled,.list-group-item.disabled:hover,.list-group-item.disabled:focus{color:#777;cursor:not-allowed;background-color:#eee}.list-group-item.disabled .list-group-item-heading,.list-group-item.disabled:hover .list-group-item-heading,.list-group-item.disabled:focus .list-group-item-heading{color:inherit}.list-group-item.disabled .list-group-item-text,.list-group-item.disabled:hover .list-group-item-text,.list-group-item.disabled:focus .list-group-item-text{color:#777}.list-group-item.active,.list-group-item.active:hover,.list-group-item.active:focus{z-index:2;color:#fff;background-color:#337ab7;border-color:#337ab7}.list-group-item.active .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active .list-group-item-heading>small,.list-group-item.active:hover .list-group-item-heading>small,.list-group-item.active:focus .list-group-item-heading>small,.list-group-item.active .list-group-item-heading>.small,.list-group-item.active:hover .list-group-item-heading>.small,.list-group-item.active:focus .list-group-item-heading>.small{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:hover .list-group-item-text,.list-group-item.active:focus .list-group-item-text{color:#c7ddef}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:hover,a.list-group-item-success:focus{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:hover,a.list-group-item-success.active:focus{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:hover,a.list-group-item-info:focus{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:hover,a.list-group-item-info.active:focus{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning{color:#8a6d3b}a.list-group-item-warning .list-group-item-heading{color:inherit}a.list-group-item-warning:hover,a.list-group-item-warning:focus{color:#8a6d3b;background-color:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:hover,a.list-group-item-warning.active:focus{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:hover,a.list-group-item-danger:focus{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:hover,a.list-group-item-danger.active:focus{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05)}.panel-body{padding:15px}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-left-radius:3px;border-top-right-radius:3px}.panel-heading>.dropdown .dropdown-toggle{color:inherit}.panel-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}.panel-title>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.list-group,.panel>.panel-collapse>.list-group{margin-bottom:0}.panel>.list-group .list-group-item,.panel>.panel-collapse>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group:first-child .list-group-item:first-child,.panel>.panel-collapse>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-left-radius:3px;border-top-right-radius:3px}.panel>.list-group:last-child .list-group-item:last-child,.panel>.panel-collapse>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.list-group+.panel-footer{border-top-width:0}.panel>.table,.panel>.table-responsive>.table,.panel>.panel-collapse>.table{margin-bottom:0}.panel>.table caption,.panel>.table-responsive>.table caption,.panel>.panel-collapse>.table caption{padding-right:15px;padding-left:15px}.panel>.table:first-child,.panel>.table-responsive:first-child>.table:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table:first-child>thead:first-child>tr:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table:last-child,.panel>.table-responsive:last-child>.table:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table:last-child>tbody:last-child>tr:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive,.panel>.table+.panel-body,.panel>.table-responsive+.panel-body{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child th,.panel>.table>tbody:first-child>tr:first-child td{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0}.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0}.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th{border-bottom:0}.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}.panel>.table-responsive{margin-bottom:0;border:0}.panel-group{margin-bottom:20px}.panel-group .panel{margin-bottom:0;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse>.panel-body,.panel-group .panel-heading+.panel-collapse>.list-group{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}.panel-default>.panel-heading .badge{color:#f5f5f5;background-color:#333}.panel-default>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#337ab7}.panel-primary>.panel-heading{color:#fff;background-color:#337ab7;border-color:#337ab7}.panel-primary>.panel-heading+.panel-collapse>.panel-body{border-top-color:#337ab7}.panel-primary>.panel-heading .badge{color:#337ab7;background-color:#fff}.panel-primary>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#337ab7}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse>.panel-body{border-top-color:#d6e9c6}.panel-success>.panel-heading .badge{color:#dff0d8;background-color:#3c763d}.panel-success>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse>.panel-body{border-top-color:#bce8f1}.panel-info>.panel-heading .badge{color:#d9edf7;background-color:#31708f}.panel-info>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse>.panel-body{border-top-color:#faebcc}.panel-warning>.panel-heading .badge{color:#fcf8e3;background-color:#8a6d3b}.panel-warning>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ebccd1}.panel-danger>.panel-heading .badge{color:#f2dede;background-color:#a94442}.panel-danger>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ebccd1}.embed-responsive{position:relative;display:block;height:0;padding:0;overflow:hidden}.embed-responsive .embed-responsive-item,.embed-responsive iframe,.embed-responsive embed,.embed-responsive object,.embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}.embed-responsive.embed-responsive-16by9{padding-bottom:56.25%}.embed-responsive.embed-responsive-4by3{padding-bottom:75%}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;filter:alpha(opacity=20);opacity:.2}.close:hover,.close:focus{color:#000;text-decoration:none;cursor:pointer;filter:alpha(opacity=50);opacity:.5}button.close{-webkit-appearance:none;padding:0;cursor:pointer;background:0 0;border:0}.modal-open{overflow:hidden}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;display:none;overflow:hidden;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transition:-webkit-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out;-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);-o-transform:translate(0,-25%);transform:translate(0,-25%)}.modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);-o-transform:translate(0,0);transform:translate(0,0)}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal-dialog{position:relative;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #999;border:1px solid rgba(0,0,0,.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5)}.modal-backdrop{position:absolute;top:0;right:0;left:0;background-color:#000}.modal-backdrop.fade{filter:alpha(opacity=0);opacity:0}.modal-backdrop.in{filter:alpha(opacity=50);opacity:.5}.modal-header{min-height:16.43px;padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.42857143}.modal-body{position:relative;padding:15px}.modal-footer{padding:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,.5);box-shadow:0 5px 15px rgba(0,0,0,.5)}.modal-sm{width:300px}}@media (min-width:992px){.modal-lg{width:900px}}.tooltip{position:absolute;z-index:1070;display:block;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:12px;font-weight:400;line-height:1.4;visibility:visible;filter:alpha(opacity=0);opacity:0}.tooltip.in{filter:alpha(opacity=90);opacity:.9}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;text-decoration:none;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-left .tooltip-arrow{right:5px;bottom:0;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-right .tooltip-arrow{bottom:0;left:5px;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-left .tooltip-arrow{top:0;right:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-right .tooltip-arrow{top:0;left:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.popover{position:absolute;top:0;left:0;z-index:1060;display:none;max-width:276px;padding:1px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;font-weight:400;line-height:1.42857143;text-align:left;white-space:normal;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2)}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover>.arrow,.popover>.arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover>.arrow{border-width:11px}.popover>.arrow:after{content:"";border-width:10px}.popover.top>.arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,.25);border-bottom-width:0}.popover.top>.arrow:after{bottom:1px;margin-left:-10px;content:" ";border-top-color:#fff;border-bottom-width:0}.popover.right>.arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,.25);border-left-width:0}.popover.right>.arrow:after{bottom:-10px;left:1px;content:" ";border-right-color:#fff;border-left-width:0}.popover.bottom>.arrow{top:-11px;left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,.25)}.popover.bottom>.arrow:after{top:1px;margin-left:-10px;content:" ";border-top-width:0;border-bottom-color:#fff}.popover.left>.arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,.25)}.popover.left>.arrow:after{right:1px;bottom:-10px;content:" ";border-right-width:0;border-left-color:#fff}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>img,.carousel-inner>.item>a>img{line-height:1}@media all and (transform-3d),(-webkit-transform-3d){.carousel-inner>.item{-webkit-transition:-webkit-transform .6s ease-in-out;-o-transition:-o-transform .6s ease-in-out;transition:transform .6s ease-in-out;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-perspective:1000;perspective:1000}.carousel-inner>.item.next,.carousel-inner>.item.active.right{left:0;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}.carousel-inner>.item.prev,.carousel-inner>.item.active.left{left:0;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}.carousel-inner>.item.next.left,.carousel-inner>.item.prev.right,.carousel-inner>.item.active{left:0;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;bottom:0;left:0;width:15%;font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6);filter:alpha(opacity=50);opacity:.5}.carousel-control.left{background-image:-webkit-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,.0001)));background-image:linear-gradient(to right,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);background-repeat:repeat-x}.carousel-control.right{right:0;left:auto;background-image:-webkit-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.0001)),to(rgba(0,0,0,.5)));background-image:linear-gradient(to right,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);background-repeat:repeat-x}.carousel-control:hover,.carousel-control:focus{color:#fff;text-decoration:none;filter:alpha(opacity=90);outline:0;opacity:.9}.carousel-control .icon-prev,.carousel-control .icon-next,.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right{position:absolute;top:50%;z-index:5;display:inline-block}.carousel-control .icon-prev,.carousel-control .glyphicon-chevron-left{left:50%;margin-left:-10px}.carousel-control .icon-next,.carousel-control .glyphicon-chevron-right{right:50%;margin-right:-10px}.carousel-control .icon-prev,.carousel-control .icon-next{width:20px;height:20px;margin-top:-10px;font-family:serif}.carousel-control .icon-prev:before{content:'\2039'}.carousel-control .icon-next:before{content:'\203a'}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;padding-left:0;margin-left:-30%;text-align:center;list-style:none}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;cursor:pointer;background-color:#000 \9;background-color:rgba(0,0,0,0);border:1px solid #fff;border-radius:10px}.carousel-indicators .active{width:12px;height:12px;margin:0;background-color:#fff}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-prev,.carousel-control .icon-next{width:30px;height:30px;margin-top:-15px;font-size:30px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{margin-left:-15px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{margin-right:-15px}.carousel-caption{right:20%;left:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.clearfix:before,.clearfix:after,.dl-horizontal dd:before,.dl-horizontal dd:after,.container:before,.container:after,.container-fluid:before,.container-fluid:after,.row:before,.row:after,.form-horizontal .form-group:before,.form-horizontal .form-group:after,.btn-toolbar:before,.btn-toolbar:after,.btn-group-vertical>.btn-group:before,.btn-group-vertical>.btn-group:after,.nav:before,.nav:after,.navbar:before,.navbar:after,.navbar-header:before,.navbar-header:after,.navbar-collapse:before,.navbar-collapse:after,.pager:before,.pager:after,.panel-body:before,.panel-body:after,.modal-footer:before,.modal-footer:after{display:table;content:" "}.clearfix:after,.dl-horizontal dd:after,.container:after,.container-fluid:after,.row:after,.form-horizontal .form-group:after,.btn-toolbar:after,.btn-group-vertical>.btn-group:after,.nav:after,.navbar:after,.navbar-header:after,.navbar-collapse:after,.pager:after,.panel-body:after,.modal-footer:after{clear:both}.center-block{display:block;margin-right:auto;margin-left:auto}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none!important;visibility:hidden!important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-xs,.visible-sm,.visible-md,.visible-lg{display:none!important}.visible-xs-block,.visible-xs-inline,.visible-xs-inline-block,.visible-sm-block,.visible-sm-inline,.visible-sm-inline-block,.visible-md-block,.visible-md-inline,.visible-md-inline-block,.visible-lg-block,.visible-lg-inline,.visible-lg-inline-block{display:none!important}@media (max-width:767px){.visible-xs{display:block!important}table.visible-xs{display:table}tr.visible-xs{display:table-row!important}th.visible-xs,td.visible-xs{display:table-cell!important}}@media (max-width:767px){.visible-xs-block{display:block!important}}@media (max-width:767px){.visible-xs-inline{display:inline!important}}@media (max-width:767px){.visible-xs-inline-block{display:inline-block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block!important}table.visible-sm{display:table}tr.visible-sm{display:table-row!important}th.visible-sm,td.visible-sm{display:table-cell!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-block{display:block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline{display:inline!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline-block{display:inline-block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md{display:block!important}table.visible-md{display:table}tr.visible-md{display:table-row!important}th.visible-md,td.visible-md{display:table-cell!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-block{display:block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline{display:inline!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline-block{display:inline-block!important}}@media (min-width:1200px){.visible-lg{display:block!important}table.visible-lg{display:table}tr.visible-lg{display:table-row!important}th.visible-lg,td.visible-lg{display:table-cell!important}}@media (min-width:1200px){.visible-lg-block{display:block!important}}@media (min-width:1200px){.visible-lg-inline{display:inline!important}}@media (min-width:1200px){.visible-lg-inline-block{display:inline-block!important}}@media (max-width:767px){.hidden-xs{display:none!important}}@media (min-width:768px) and (max-width:991px){.hidden-sm{display:none!important}}@media (min-width:992px) and (max-width:1199px){.hidden-md{display:none!important}}@media (min-width:1200px){.hidden-lg{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:block!important}table.visible-print{display:table}tr.visible-print{display:table-row!important}th.visible-print,td.visible-print{display:table-cell!important}}.visible-print-block{display:none!important}@media print{.visible-print-block{display:block!important}}.visible-print-inline{display:none!important}@media print{.visible-print-inline{display:inline!important}}.visible-print-inline-block{display:none!important}@media print{.visible-print-inline-block{display:inline-block!important}}@media print{.hidden-print{display:none!important}}
-\ No newline at end of file
diff --git a/admportal/views/error.ejs b/admportal/views/error.ejs
deleted file mode 100644
index 7cf94edf..00000000
--- a/admportal/views/error.ejs
+++ /dev/null
@@ -1,3 +0,0 @@
-<h1><%= message %></h1>
-<h2><%= error.status %></h2>
-<pre><%= error.stack %></pre>
diff --git a/admportal/views/gamma/list.ejs b/admportal/views/gamma/list.ejs
deleted file mode 100644
index cf89a093..00000000
--- a/admportal/views/gamma/list.ejs
+++ /dev/null
@@ -1,162 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#vlan_id_pool').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>NoD VLAN ID POOL</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-		if (result.code.length > 0) { 
-			if ( result.code == 'success' ) { %>
-				<div class='alert alert-success' role='alert'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } else { %> 
-				<div class='alert alert-danger' role='danger'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } %>
-		<% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){ 
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-<div class="container-fluid">
-	<table id="vlan_id_pool" class="table table-hover table-condensed">
-      <thead>
-        <tr>
-          <th>AIC Site ID</th>
-          <th>Purpose</th>
-		  <th>VLAN ID</th>
-	      <th>VLPSPE Name</th>
-	  	  <th>Availability Zone</th>
-          <th>Status</th>
-          <th>Svc Instance ID</th>
-		  <% if(priv == 'A'){ %>
-		  <th>Action</th>
-		  <% } %>
-        </tr>
-      </thead>
-      <tbody>
-      <% rows.forEach( function(row) { %> 
-        <tr>
-            <td><%= row.aic_site_id %></td>
-            <td><%= row.purpose %></td>
-            <td><%= row.vlan_id %></td>
-            <td><%= row.vplspe_name %></td>
-            <td><%= row.availability_zone %></td>
-            <td><%= row.status %></td>
-            <td><%= row.svc_instance_id %></td>
-			<% if(priv == 'A') { %>
-            <td>
-				 <button type="button" class="btn btn-default btn-xs"
-                 	onclick="updateVlanPool('<%=row.aic_site_id %>','<%= row.availability_zone %>',
-						'<%= row.purpose %>','<%= row.vlan_id %>','<%= row.status %>',
-						'<%= row.svc_instance_id %>','<%= row.vplspe_name %>');">Update</button>
-				 <button type="button" class="btn btn-default btn-xs"
-                 	onclick="deleteVlanPool('<%=row.aic_site_id %>', '<%= row.purpose %>', 
-						'<%= row.vlan_id %>');">Delete</button>
-            </td>
-            <% } %>
-        </tr>
-    <% }); %>
-      </tbody>
-    </table>
-
-<!--
-	<% if(priv == 'A'){ %>
-	<div class="actions" style="padding:0px 25px;">
-	<form method="POST" action="/gamma/uploadVLAN" enctype="multipart/form-data">
-		<div class="form-group">
-    		<label for="dest">File input</label>
-    		<input name="filename" type="file" id="dest">
-    		<p class="help-block">Choose a file to upload.</p>
-  		</div>
-		<% if(priv == 'A') { %>
-            <button type="button" class="btn btn-default"
-                onclick="uploadFile(this.form);">Upload File</button>
-        <% } else { %>
-            <button type="button" class="btn btn-default disabled"
-                onclick="uploadFile(this.form);">Upload File</button>
-        <% } %>
-	</form>
-	</div>
-	<% } %>
--->
-</div>
-
-<% include ../partials/update_vlan_id_pool %>
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-<script type="text/javascript">
-function updateVlanPool(aic_site_id,availability_zone,purpose,vlan_id,status,svc_instance_id,vplspe_name) {
-
-    document.getElementById('uf_aic_site_id').value=aic_site_id;
-    document.getElementById('uf_availability_zone').value=availability_zone
-    document.getElementById('uf_purpose').value=purpose;
-    document.getElementById('uf_vlan_id').value=vlan_id;
-    document.getElementById('uf_status').value=status;
-    document.getElementById('uf_svc_instance_id').value=svc_instance_id;
-    document.getElementById('uf_vplspe_name').value=vplspe_name;
-
-    document.getElementById('uf_key_aic_site_id').value=aic_site_id;
-    document.getElementById('uf_key_purpose').value=purpose;
-    document.getElementById('uf_key_vlan_id').value=vlan_id;
-    $('#update_vlan_id_pool_modal').modal('show');
-}
-
-function deleteVlanPool(aic_site_id,purpose,vlan_id) {
-
-    bootbox.confirm({
-        message: "Are you sure you want to delete VLAN Id [" + aic_site_id + "][" + purpose + "][" + vlan_id + "] ?",
-        callback: function(result) {
-            if ( result )
-            {
-                location.assign("/gamma/deleteVlanPool?aic_site_id=" + aic_site_id + "&purpose=" + purpose + "&vlan_id=" + vlan_id);
-            }
-            return;
-        },
-        buttons: {
-            cancel: {
-                label: "Cancel"
-            },
-            confirm: {
-                label: "Yes"
-            }
-        }
-    });
-}
-</script>
-
-</body>
-</html>
-
diff --git a/admportal/views/gamma/listAicAvailZone.ejs b/admportal/views/gamma/listAicAvailZone.ejs
deleted file mode 100644
index 7d0b7bde..00000000
--- a/admportal/views/gamma/listAicAvailZone.ejs
+++ /dev/null
@@ -1,166 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-
-<script class="init">
-    $(document).ready(function() {
-    $('#availability_zone').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>AIC Availabilty Zone Pool</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-		if (result.code.length > 0) { 
-			if ( result.code == 'success' ) { %>
-				<div class='alert alert-success' role='alert'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } else { %> 
-				<div class='alert alert-danger' role='danger'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } %>
-		<% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-	<table id="availability_zone" class="table table-hover table-condensed">
-      <thead>
-        <tr>
-          <th>AIC Site ID</th>
-          <th>Availability Zone</th>
-          <th>Token</th>
-		  <th>Service Type</th>
-          <th>Status</th>
-          <th>VNF ID</th>
-          <th>VNF Type</th>
-          <th>Hypervisor</th>
-		  <% if(priv == 'A') { %>
-		  <th>Action</th>
-		  <% } %>
-        </tr>
-      </thead>
-      <tbody>
-      <% rows.forEach( function(row) { %> 
-        <tr>
-            <td><%= row.aic_site_id %></td>
-            <td><%= row.availability_zone %></td>
-            <td><%= row.token %></td>
-            <td><%= row.service_type %></td>
-            <td><%= row.status %></td>
-            <td><%= row.vnf_id %></td>
-            <td><%= row.vnf_type %></td>
-            <td><%= row.hypervisor %></td>
-			<% if(priv == 'A') { %>
-            <td>
-				<button type="button" class="btn btn-default btn-xs"
-                    onclick="updateAicAvailZone('<%=row.aic_site_id %>','<%= row.availability_zone %>','<%= row.token %>','<%= row.service_type %>','<%= row.status %>','<%= row.vnf_id %>','<%= row.vnf_type %>','<%= row.hypervisor %>');">Update</button>
-				<button type="button" class="btn btn-default btn-xs"
-                   onclick="deleteZone('<%=row.aic_site_id %>','<%= row.availability_zone %>', '<%= row.token %>');">Delete</button>
-            </td>
-            <% } %>
-        </tr>
-    <% }); %>
-      </tbody>
-    </table>
-
-
-<!--
-	<% if(priv == 'A'){ %>
-	<div class="actions" style="padding:0px 25px;">
-	<form method="POST" action="/gamma/uploadAicAvailZone" enctype="multipart/form-data">
-		<div class="form-group">
-    		<label for="dest">File input</label>
-    		<input name="filename" type="file" id="dest">
-    		<p class="help-block">Choose a file to upload.</p>
-  		</div>
-		<% if(priv == 'A') { %>
-			<button type="button" class="btn btn-default"
-				onclick="uploadFile(this.form);">Upload File</button>
-		<% } else { %>
-			<button type="button" class="btn btn-default disabled"
-				onclick="uploadFile(this.form);">Upload File</button>
-		<% } %>
-	</form>
-	</div>
-	<% } %>
--->
-</div>
-
-<% include ../partials/update_aic_avail_zone %>
-
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-<script type="text/javascript">
-function updateAicAvailZone(aic_site_id,availability_zone,token,service_type,status,vnf_id,vnf_type,hypervisor) {
-
-    document.getElementById('uf_aic_site_id').value=aic_site_id;
-    document.getElementById('uf_availability_zone').value=availability_zone
-    document.getElementById('uf_token').value=token;
-    document.getElementById('uf_service_type').value=service_type;
-    document.getElementById('uf_status').value=status;
-    document.getElementById('uf_vnf_id').value=vnf_id;
-    document.getElementById('uf_vnf_type').value=vnf_type;
-    document.getElementById('uf_hypervisor').value=hypervisor;
-    document.getElementById('uf_key_aic_site_id').value=aic_site_id;
-    document.getElementById('uf_key_availability_zone').value=availability_zone
-    document.getElementById('uf_key_token').value=token;
-    $('#update_aic_avail_zone_modal').modal('show');
-}
-
-function deleteZone(siteid,azone,token) {
-
-    bootbox.confirm({
-        message: "Are you sure you want to delete zone [" + siteid + "][" + azone + "][" + token + "] ?",
-        callback: function(result) {
-            if ( result )
-            {
-                location.assign("/gamma/deleteZone?siteid=" + siteid + "&azone=" + azone + "&token=" + token);
-            }
-            return;
-        },
-        buttons: {
-            cancel: {
-                label: "Cancel"
-            },
-            confirm: {
-                label: "Yes"
-            }
-        }
-    });
-}
-</script>
-
-
-</body>
-</html>
-
diff --git a/admportal/views/gamma/listAicSwitch.ejs b/admportal/views/gamma/listAicSwitch.ejs
deleted file mode 100644
index 659652c3..00000000
--- a/admportal/views/gamma/listAicSwitch.ejs
+++ /dev/null
@@ -1,156 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-  
-  <script class="init">
-    $(document).ready(function() {
-    $('#switch').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-	} );
-  </script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>AIC Switch</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-		if (result.code.length > 0) { 
-			if ( result.code == 'success' ) { %>
-				<div class='alert alert-success' role='alert'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } else { %> 
-				<div class='alert alert-danger' role='danger'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } %>
-		<% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-	<table id="switch" class="table table-hover table-condensed">
-      <thead>
-        <tr>
-		  <th>Physical Network Name</th>
-          <th>Switch Name</th>
-          <th>AIC Site ID</th>
-          <th>UUID</th>
-          <th>Availability Zone</th>
-		  <% if(priv == 'A') { %>
-		  <th>Action</th>
-		  <% } %>
-        </tr>
-      </thead>
-      <tbody>
-      <% rows.forEach( function(row) { %> 
-        <tr>
-            <td><%= row.physical_network_name %></td>
-            <td><%= row.switch_name %></td>
-            <td><%= row.aic_site_id %></td>
-            <td><%= row.uuid %></td>
-            <td><%= row.availability_zone %></td>
-			<% if(priv == 'A') { %>
-            <td>
-				<button type="button" class="btn btn-default btn-xs"
-					onclick="updateAicSwitch('<%= row.physical_network_name %>','<%= row.switch_name %>','<%=row.aic_site_id %>','<%= row.uuid %>','<%=row.availability_zone %>');">Update</button>
-
-				<button type="button" class="btn btn-default btn-xs"
-                   onclick="deleteSwitch('<%=row.physical_network_name %>');">Delete</button>
-            </td>
-            <% } %>
-
-        </tr>
-    <% }); %>
-      </tbody>
-    </table>
-
-
-<!--
-	<% if(priv == 'A') { %>
-	<div class="actions" style="padding:0px 25px;">
-	<form method="POST" action="/gamma/uploadAicSwitch" enctype="multipart/form-data">
-		<div class="form-group">
-    		<label for="dest">File input</label>
-    		<input name="filename" type="file" id="dest">
-    		<p class="help-block">Choose a file to upload.</p>
-  		</div>
-
-		<% if(priv == 'A') { %>
-            <button type="button" class="btn btn-default"
-                onclick="uploadFile(this.form);">Upload File</button>
-        <% } else { %>
-            <button type="button" class="btn btn-default disabled"
-                onclick="uploadFile(this.form);">Upload File</button>
-        <% } %>
-	</form>
-	</div>
-	<% } %>
--->
-</div>
-
-<% include ../partials/update_aic_switch %>
-
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-<script type="text/javascript">
-function updateAicSwitch(physical_network_name,switch_name,aic_site_id,uuid,availability_zone) {
-
-    document.getElementById('uf_physical_network_name').value=physical_network_name;
-    document.getElementById('uf_switch_name').value=switch_name;
-    document.getElementById('uf_aic_site_id').value=aic_site_id;
-    document.getElementById('uf_uuid').value=uuid;
-    document.getElementById('uf_availability_zone').value=availability_zone;
-    document.getElementById('uf_key_physical_network_name').value=physical_network_name;
-    $('#update_aic_switch_modal').modal('show');
-}
-function deleteSwitch(pnetwork_name) {
-
-    bootbox.confirm({
-        message: "Are you sure you want to delete this switch [" + pnetwork_name + "] ?",
-        callback: function(result) {
-            if ( result )
-            {
-                location.assign("/gamma/deleteSwitch?phy_network_name=" + pnetwork_name);
-            }
-            return;
-        },
-        buttons: {
-            cancel: {
-                label: "Cancel"
-            },
-            confirm: {
-                label: "Yes"
-            }
-        }
-    });
-}
-</script>
-
-</body>
-</html>
-
diff --git a/admportal/views/gamma/listServiceHoming.ejs b/admportal/views/gamma/listServiceHoming.ejs
deleted file mode 100644
index e25777a9..00000000
--- a/admportal/views/gamma/listServiceHoming.ejs
+++ /dev/null
@@ -1,241 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>Service Homing</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-		if (result.code.length > 0) { 
-			if ( result.code == 'success' ) { %>
-				<div class='alert alert-success' role='alert'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } else { %> 
-				<div class='alert alert-danger' role='danger'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } %>
-		<% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-
-	<% if (priv == 'A'){ %>
-	<div class="actions" style="padding:15px 0px;">
-    <button class="btn btn-primary" data-toggle="modal" data-target="#add_service_homing">
-      Add Service Homing
-    </button>
-	</div>
-	<% } %>
-
-	<table class="table table-hover table-condensed">
-      <thead>
-        <tr>
-		  <th>*Service Type</th>
-          <th>*LATA</th>
-		  <th>*Hubbing City Type</th>
-          <th>Latitude</th>
-          <th>Longitude</th>
-          <th>*Primary Site Name</th>
-          <th>Secondary Site Name</th>
-          <th>Tertiary Site Name</th>
-		   <% if(priv == 'A'){ %>
-          <th>Action</th>
-          <% } %>
-        </tr>
-      </thead>
-      <tbody>
-      <% var i=0; rows.forEach( function(row) { %> 
-        <tr>
-            <td><%= row.service_type %></td>
-            <td><%= row.lata %></td>
-            <td><%= row.hubbing_city_type%></td>
-            <td><%= row.latitude %></td>
-            <td><%= row.longitude %></td>
-            <td><%= row.primary_aic_site_name %></td>
-            <td><%= row.secondary_aic_site_name %></td>
-            <td><%= row.tertiary_aic_site_name %></td>
-			<% if(priv == 'A') { %>
-            <td>
-				<button type="button" class="btn btn-default btn-xs"
-                    onclick="updateServiceHoming('<%=row.service_type %>','<%= row.lata %>','<%= row.hubbing_city_type %>','<%= row.latitude %>','<%= row.longitude %>','<%= row.primary_aic_site_name %>','<%= row.secondary_aic_site_name %>','<%= row.tertiary_aic_site_name %>');">Update</button>
-				<button type="button" class="btn btn-default btn-xs"
-                   onclick="deleteServiceHoming('<%= row.service_type %>','<%=row.lata %>','<%= row.hubbing_city_type %>');">Delete</button>
-            </td>
-            <% } %>
-
-        </tr>
-    <% i++; }); %>
-      </tbody>
-    </table>
-
-	 <div class container>
-        <p><%= i %> rows in table.</p>
-    </div>
-
-
-	<% if(priv == 'A'){ %>
-	<div class="actions" style="padding:0px 25px;">
-	<form method="POST" action="/gamma/uploadServiceHoming" enctype="multipart/form-data">
-		<div class="form-group">
-    		<label for="dest">File input</label>
-    		<input name="filename" type="file" id="dest">
-    		<p class="help-block">Choose a file to upload.</p>
-  		</div>
-		<% if(priv == 'A') { %>
-            <button type="button" class="btn btn-default"
-                onclick="uploadFile(this.form);">Upload File</button>
-        <% } else { %>
-            <button type="button" class="btn btn-default disabled"
-                onclick="uploadFile(this.form);">Upload File</button>
-        <% } %>
-
-	</form>
-	</div>
-	<% } %>
-</div>
-
-<% include ../partials/add_service_homing %>
-<% include ../partials/update_service_homing %>
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-<script type="text/javascript">
-
-function submitServiceHoming(form)
-{
-	var errorMsg='';
-	var lata='';
-	var hubbing_city_type='';
-	var primary_aic_site_name='';
-	var latitude='';
-	var longitude='';
-
-	if ( form.name == 'addForm' )
-	{
-		lata = form.nf_lata;
-		hubbing_city_type = form.nf_hubbing_city_type;
-		primary_aic_site_name = form.nf_primary_aic_site_name;
-		latitude = form.nf_latitude;
-		longitude = form.nf_longitude;
-	}
-	else
-	{
-		lata = form.uf_lata;
-		hubbing_city_type = form.uf_hubbing_city_type;
-		primary_aic_site_name = form.uf_primary_aic_site_name;
-		latitude = form.uf_latitude;
-		longitude = form.uf_longitude;
-	}
-
-
-	if ( (lata.value == null) || (lata.value == "") || isblank(lata.value) )
-	{
-		errorMsg += 'LATA is required.<br>';
-	}
-	if ( (hubbing_city_type.value == null) || (hubbing_city_type.value == "") || isblank(hubbing_city_type.value) )
-	{
-		errorMsg += 'Hubbing City Type is required.<br>';
-	}
-	if ( (primary_aic_site_name.value == null) || (primary_aic_site_name.value == "") || isblank(primary_aic_site_name.value) ){
-		errorMsg += 'Primary Site Name is required.<br>';
-	}
-	if( errorMsg.length > 0 ) {
-		bootbox.alert(errorMsg);
-		return;
-	}
-
-	if ( !isDigit(lata.value) )
-	{
-		bootbox.alert('LATA must be a number.');
-		return;
-	}
-	if ( latitude.length > 0 )
-	{
-		if ( !isFloat(latitude.value) )
-		{
-			bootbox.alert('Latitude must be a float.');
-			return;
-		}
-	}
-	if ( longitude.length > 0 )
-	{
-		if ( !isFloat(longitude.value) )
-		{
-			bootbox.alert('Longitude must be a float.');
-			return;
-		}
-	}
-	form.submit();
-}
-
-function updateServiceHoming(service_type,lata,hubbing_city_type,latitude,longitude,primary_aic_site_name,secondary_aic_site_name,tertiary_aic_site_name) {
-
-    document.getElementById('uf_service_type').value=service_type;
-    document.getElementById('uf_lata').value=lata
-    document.getElementById('uf_hubbing_city_type').value=hubbing_city_type;
-    document.getElementById('uf_latitude').value=latitude;
-    document.getElementById('uf_longitude').value=longitude;
-    document.getElementById('uf_primary_aic_site_name').value=primary_aic_site_name;
-    document.getElementById('uf_secondary_aic_site_name').value=secondary_aic_site_name;
-    document.getElementById('uf_tertiary_aic_site_name').value=tertiary_aic_site_name;
-
-    document.getElementById('uf_key_service_type').value=service_type;
-    document.getElementById('uf_key_lata').value=lata
-    document.getElementById('uf_key_hubbing_city_type').value=hubbing_city_type;
-
-    $('#update_service_homing').modal('show');
-}
-
-function deleteServiceHoming(service_type,lata,hubbing_city_type) {
-
-    bootbox.confirm({
-        message: "Are you sure you want to delete SERVICE_HOMING [" + service_type + "]" + "[" + lata + "][" + hubbing_city_type + "]",
-        callback: function(result) {
-            if ( result )
-            {
-				location.assign("/gamma/deleteServiceHoming?service_type=" + service_type + "&lata=" + lata + "&hubbing_city_type=" + hubbing_city_type);
-
-            }
-            return;
-        },
-        buttons: {
-            cancel: {
-                label: "Cancel"
-            },
-            confirm: {
-                label: "Yes"
-            }
-        }
-    });
-}
-
-</script>
-
-</body>
-</html>
-
diff --git a/admportal/views/gamma/listServiceHomingRollback.ejs b/admportal/views/gamma/listServiceHomingRollback.ejs
deleted file mode 100644
index a7b5ef5a..00000000
--- a/admportal/views/gamma/listServiceHomingRollback.ejs
+++ /dev/null
@@ -1,117 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>Service Homing Rollback</h3>
-<p>(This table data was saved during the last import of SERVICE_HOMING data.)</p>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-		if (result.code.length > 0) { 
-			if ( result.code == 'success' ) { %>
-				<div class='alert alert-success' role='alert'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } else { %> 
-				<div class='alert alert-danger' role='danger'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } %>
-		<% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-	<table class="table table-hover table-condensed">
-      <thead>
-        <tr>
-		  <th>Service Type</th>
-          <th>LATA</th>
-		  <th>Hubbing City Type</th>
-          <th>Latitude</th>
-          <th>Longitude</th>
-          <th>Primary Site Name</th>
-          <th>Secondary Site Name</th>
-          <th>Tertiary Site Name</th>
-        </tr>
-      </thead>
-      <tbody>
-      <% var i=0; rows.forEach( function(row) { %> 
-        <tr>
-            <td><%= row.service_type %></td>
-            <td><%= row.lata %></td>
-            <td><%= row.hubbing_city_type%></td>
-            <td><%= row.latitude %></td>
-            <td><%= row.longitude %></td>
-            <td><%= row.primary_aic_site_name %></td>
-            <td><%= row.secondary_aic_site_name %></td>
-            <td><%= row.tertiary_aic_site_name %></td>
-        </tr>
-    <% i++; }); %>
-      </tbody>
-    </table>
-
-	 <div class container>
-        <p><%= i %> rows in table.</p>
-    </div>
-
-	<% if (priv == 'A') { %>
-	<button type="button" class="btn btn-default"
-                onclick="rollback();">Rollback</button>
-	<% } %>
-</div>
-
-<footer>
-    <% include ../partials/footer %>
-</footer>
-<script type="text/javascript">
-
-function rollback()
-{
-	bootbox.confirm({
-		message: "This Rollback will overlay the current SERVICE_HOMING table.  Are you sure you want to Rollback the SERVICE_HOMING table?",
-		callback: function(result){
-			if(result)
-			{
-				location.assign("/gamma/rollbackServiceHoming");
-			}
-			return;
-		},
-		buttons: {
-			cancel: {
-				label: "Cancel"
-			},
-			confirm:{
-				label: "Yes"
-			}
-		}
-	});
-}
-
-</script>
-
-
-</body>
-</html>
-
diff --git a/admportal/views/gamma/listSite.ejs b/admportal/views/gamma/listSite.ejs
deleted file mode 100644
index 9287ad5c..00000000
--- a/admportal/views/gamma/listSite.ejs
+++ /dev/null
@@ -1,171 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#site').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-    <h3>AIC Site</h3>
-</div>
-<!--
-<div class="actions" style="padding:0px 25px;">
-<h2>AIC SITE</h2>
-</div>
--->
-
-<% if ( typeof result != 'undefined' ) {
-		if (result.code.length > 0) { 
-			if ( result.code == 'success' ) { %>
-				<div class='alert alert-success' role='alert'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } else { %> 
-				<div class='alert alert-danger' role='danger'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } %>
-		<% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-<div class="container-fluid">
-	<table id="site" class="table table-hover table-condensed">
-      <thead>
-        <tr>
-		  <th>Name</th>
-          <th>AIC Site ID</th>
-          <th>VCenter URL</th>
-		  <th>OAM Gateway Address</th>
-          <th>VCenter User</th>
-          <th>VCenter Passwd</th>
-          <th>City</th>
-          <th>State</th>
-          <th>Status</th>
-		  <% if(priv == 'A') { %>
-		  <th>Action</th>
-		  <% } %>
-        </tr>
-      </thead>
-      <tbody>
-      <% rows.forEach( function(row) { %> 
-        <tr>
-            <td><%= row.name %></td>
-            <td><%= row.aic_site_id %></td>
-            <td><%= row.vcenter_url %></td>
-			<td><%= row.oam_gateway_addr %></td>
-            <td><%= row.vcenter_username %></td>
-			<td>*****</td>
-            <td><%= row.city %></td>
-            <td><%= row.state %></td>
-            <td><%= row.operational_status %></td>
-			<% if(priv == 'A') { %>
-			<td>
-				<button type="button" class="btn btn-default btn-xs"
-					onclick="updateAicSite('<%= row.name %>','<%=row.aic_site_id %>',
-					'<%= row.vcenter_url %>','<%= JSON.stringify(row.vcenter_username).replace(/\"/g,'') %>',
-					'<%= row.vcenter_passwd %>', '<%= row.city %>','<%= row.state %>',
-					'<%= row.operational_status %>', '<%= row.oam_gateway_addr %>');">Update</button>
-				<button type="button" class="btn btn-default btn-xs"
-					onclick="deleteSite('<%=row.aic_site_id %>');">Delete</button>
-			</td>
-			<% } %>
-        </tr>
-    <% }); %>
-      </tbody>
-    </table>
-
-<!--
-	<% if(priv == 'A') { %>
-	<div class="actions" style="padding:0px 25px;">
-	<form method="POST" action="/gamma/uploadAicSite" enctype="multipart/form-data">
-		<div class="form-group">
-    		<label for="dest">File input</label>
-    		<input name="filename" type="file" id="dest">
-    		<p class="help-block">Choose a file to upload.</p>
-  		</div>
-		<% if(priv == 'A') { %>
-            <button type="button" class="btn btn-default"
-                onclick="uploadFile(this.form);">Upload File</button>
-        <% } else { %>
-            <button type="button" class="btn btn-default disabled"
-                onclick="uploadFile(this.form);">Upload File</button>
-        <% } %>
-	</form>
-	</div>
-	<% } %>
--->
-</div>
-
-<% include ../partials/update_aic_site %>
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-<script type="text/javascript">
-function updateAicSite(name,aic_site_id,vcenter_url,vcenter_username,vcenter_passwd,city,state,operational_status,oam_gateway_addr) 
-{
-    document.getElementById('uf_name').value=name
-    document.getElementById('uf_aic_site_id').value=aic_site_id;
-    document.getElementById('uf_vcenter_url').value=vcenter_url;
-    document.getElementById('uf_vcenter_username').value=vcenter_username;
-    document.getElementById('uf_vcenter_passwd').value=vcenter_passwd;
-    document.getElementById('uf_city').value=city;
-    document.getElementById('uf_state').value=state;
-    document.getElementById('uf_operational_status').value=operational_status;
-    document.getElementById('uf_oam_gateway_addr').value=oam_gateway_addr;
-
-    document.getElementById('uf_key_aic_site_id').value=aic_site_id;
-    $('#update_aic_site_modal').modal('show');
-}
-
-function deleteSite(siteId) {
-
-    bootbox.confirm({
-        message: "Their may be SERVICE_HOMING entry pointing to this site.  Are you sure you want to delete site [" + siteId + "] ?",
-        callback: function(result) {
-            if ( result )
-            {
-                location.assign("/gamma/deleteSite?siteid=" + siteId);
-            }
-            return;
-        },
-        buttons: {
-            cancel: {
-                label: "Cancel"
-            },
-            confirm: {
-                label: "Yes"
-            }
-        }
-    });
-}
-</script>
-
-</body>
-</html>
-
diff --git a/admportal/views/gamma/listVpePool.ejs b/admportal/views/gamma/listVpePool.ejs
deleted file mode 100644
index 51c2dfec..00000000
--- a/admportal/views/gamma/listVpePool.ejs
+++ /dev/null
@@ -1,194 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-
-<script class="init">
-    $(document).ready(function() {
-    $('#vpe_pool').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>VPE Pool</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-		if (result.code.length > 0) { 
-			if ( result.code == 'success' ) { %>
-				<div class='alert alert-success' role='alert'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } else { %> 
-				<div class='alert alert-danger' role='danger'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } %>
-		<% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-	<table id="vpe_pool" class="table table-hover table-condensed">
-      <thead>
-        <tr>
-          <th>AIC Site ID</th>
-          <th>VPE Name</th>
-          <th>Availability Zone</th>
-		  <th>IPV4 OAM Address</th>
-          <th>Loopback IPV4 Address</th>
-          <th>Prov Status</th>
-          <th>VLAN ID Outer</th>
-          <th>Vendor</th>
-          <th>Interface Name</th>
-          <th>Interface Speed</th>
-          <th>Interface Units</th>
-          <th>VPE UUID</th>
-          <th>VPE ID</th>
-		  <th>AS_NUMBER</th>
-          <th>Image Filename</th>
-		  <% if(priv == 'A'){ %>
-		  <th>Action</th>
-		  <% } %>
-        </tr>
-      </thead>
-      <tbody>
-      <% rows.forEach( function(row) { %> 
-        <tr>
-            <td><%= row.aic_site_id %></td>
-            <td><%= row.vpe_name %></td>
-            <td><%= row.availability_zone %></td>
-            <td><%= row.ipv4_oam_address %></td>
-            <td><%= row.loopback0_ipv4_address %></td>
-            <td><%= row.provisioning_status %></td>
-            <td><%= row.vlan_id_outer %></td>
-            <td><%= row.vendor %></td>
-            <td><%= row.physical_intf_name %></td>
-            <td><%= row.physical_intf_speed %></td>
-            <td><%= row.physical_intf_units %></td>
-            <td><%= row.vpe_uuid %></td>
-            <td><%= row.vpe_id %></td>
-            <td><%= row.as_number %></td>
-            <td><%= row.image_filename %></td>
-			<td>
-<!--
-				<form name="rowform">
-                <input type="hidden" name="rf_aic_site_id" id="rf_aic_site_id" value="<%= row.aic_site_id %>"</input>
-                <input type="hidden" name="rf_vpe_name" id="rf_vpe_name" value="<%= row.vpe_name %>"</input>
-                <input type="hidden" name="rf_availability_zone" id="rf_availability_zone" value="<%= row.availability_zone %>"</input>
-                </form>
--->
-                <!-- <% var _attuid = row.attuid %> -->
-                <% if(priv == 'A') { %>
-					<button type="button" class="btn btn-default btn-xs"
-                    onclick="updateVpePool('<%=row.aic_site_id %>','<%=row.vpe_name %>', '<%=row.availability_zone %>','<%=row.provisioning_status %>','<%= row.ipv4_oam_address %>','<%= row.loopback0_ipv4_address %>','<%= row.vlan_id_outer %>','<%= row.vendor %>','<%= row.physical_intf_name %>','<%= row.physical_intf_speed %>','<%= row.physical_intf_units %>','<%= row.vpe_uuid %>','<%= row.vpe_id %>', '<%= row.image_filename %>', '<%= row.as_number %>' );">Update</button>
-					<button type="button" class="btn btn-default btn-xs"
-                    onclick="deleteVpePool('<%= row.vpe_name %>','<%=row.aic_site_id %>','<%= row.availability_zone %>');">Delete</button>
-                <% } %>
-            </td>
-        </tr>
-    <% }); %>
-      </tbody>
-    </table>
-
-<!--
-	<% if(priv == 'A'){ %>
-	<div class="actions" style="padding:0px 25px;">
-	<form method="POST" action="/gamma/uploadVpePool" enctype="multipart/form-data">
-		<div class="form-group">
-    		<label for="dest">File input</label>
-    		<input name="filename" type="file" id="dest">
-    		<p class="help-block">Choose a file to upload.</p>
-  		</div>
-		<% if(priv == 'A') { %>
-            <button type="button" class="btn btn-default"
-                onclick="uploadFile(this.form);">Upload File</button>
-        <% } else { %>
-            <button type="button" class="btn btn-default disabled"
-                onclick="uploadFile(this.form);">Upload File</button>
-        <% } %>
-	</form>
-	</div>
-	<% } %>
--->
-</div>
-
-<% include ../partials/update_vpe_pool %>
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-<script type="text/javascript">
-function updateVpePool(aic_site_id,vpe_name,availability_zone,provisioning_status,ipv4_oam_address,loopback0_ipv4_address,vlan_id_outer,vendor,physical_intf_name,physical_intf_speed,physical_intf_units,vpe_uuid,vpe_id,image_filename, as_number) {
-
-    document.getElementById('uf_aic_site_id').value=aic_site_id;
-    document.getElementById('uf_vpe_name').value=vpe_name;
-    document.getElementById('uf_availability_zone').value=availability_zone;
-    document.getElementById('uf_provisioning_status').value=provisioning_status;
-    document.getElementById('uf_ipv4_oam_address').value=ipv4_oam_address;
-    document.getElementById('uf_loopback0_ipv4_address').value=loopback0_ipv4_address;
-    document.getElementById('uf_vlan_id_outer').value=vlan_id_outer;
-    document.getElementById('uf_vendor').value=vendor;
-    document.getElementById('uf_physical_intf_name').value=physical_intf_name;
-    document.getElementById('uf_physical_intf_speed').value=physical_intf_speed;
-    document.getElementById('uf_physical_intf_units').value=physical_intf_units;
-    document.getElementById('uf_vpe_uuid').value=vpe_uuid;
-    document.getElementById('uf_vpe_id').value=vpe_id;
-    document.getElementById('uf_as_number').value=as_number;
-    document.getElementById('uf_image_filename').value=image_filename;
-
-    document.getElementById('uf_key_availability_zone').value=availability_zone;
-    document.getElementById('uf_key_aic_site_id').value=aic_site_id;
-    document.getElementById('uf_key_vpe_name').value=vpe_name;
-    $('#update_vpe_pool_modal').modal('show');
-
-}
-function deleteVpePool(vpe_name,aic_site_id,availability_zone) {
-
-    bootbox.confirm({
-        message: "Are you sure you want to delete VPE [" + aic_site_id + "][" + vpe_name + "][" + availability_zone + "] ?",
-        callback: function(result) {
-            if ( result )
-            {
-                location.assign("/gamma/deleteVpePool?aic_site_id=" + aic_site_id + "&vpe_name=" + vpe_name + "&availability_zone=" + availability_zone);
-            }
-            return;
-        },
-        buttons: {
-            cancel: {
-                label: "Cancel"
-            },
-            confirm: {
-                label: "Yes"
-            }
-        }
-    });
-}
-
-</script>
-
-</body>
-</html>
-
diff --git a/admportal/views/gamma/listVplspePool.ejs b/admportal/views/gamma/listVplspePool.ejs
deleted file mode 100644
index b49c2a37..00000000
--- a/admportal/views/gamma/listVplspePool.ejs
+++ /dev/null
@@ -1,178 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-
-<script class="init">
-    $(document).ready(function() {
-    $('#vplspe_pool').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>VPLSPE Pool</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-		if (result.code.length > 0) { 
-			if ( result.code == 'success' ) { %>
-				<div class='alert alert-success' role='alert'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } else { %> 
-				<div class='alert alert-danger' role='danger'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } %>
-		<% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-<div class="container-fluid">
-	<table id="vplspe_pool" class="table table-hover table-condensed">
-      <thead>
-        <tr>
-          <th>VPLSPE Name</th>
-          <th>AIC Site ID</th>
-          <th>Availability Zone</th>
-		  <th>Interface Name</th>
-          <th>Interface Speed</th>
-          <th>Interface Units</th>
-          <th>Loopback IPV4 Address</th>
-          <th>VLAN ID Outer</th>
-          <th>VPLSPE UUID</th>
-          <th>Image Filename</th>
-          <th>Prov Status</th>
-          <th>Vendor</th>
-		  <% if(priv == 'A'){ %>
-		  <th>Action</th>
-		  <% } %>
-        </tr>
-      </thead>
-      <tbody>
-      <% rows.forEach( function(row) { %> 
-        <tr>
-            <td><%= row.vplspe_name %></td>
-            <td><%= row.aic_site_id %></td>
-            <td><%= row.availability_zone %></td>
-            <td><%= row.physical_intf_name %></td>
-            <td><%= row.physical_intf_speed %></td>
-            <td><%= row.physical_intf_units %></td>
-            <td><%= row.loopback0_ipv4_address %></td>
-            <td><%= row.vlan_id_outer %></td>
-            <td><%= row.vplspe_uuid %></td>
-            <td><%= row.image_filename %></td>
-            <td><%= row.provisioning_status %></td>
-            <td><%= row.vendor %></td>
-			<% if(priv == 'A') { %>
-            <td>
-				<button type="button" class="btn btn-default btn-xs"
-                    onclick="updateVplspePool('<%=row.aic_site_id %>','<%= row.availability_zone %>','<%= row.vplspe_name %>','<%= row.physical_intf_name %>','<%= row.physical_intf_speed %>','<%= row.physical_intf_units %>','<%= row.loopback0_ipv4_address %>','<%= row.vlan_id_outer %>','<%= row.vplspe_uuid %>','<%= row.image_filename %>','<%= row.provisioning_status %>','<%= row.vendor %>');">Update</button>
-				<button type="button" class="btn btn-default btn-xs"
-                   onclick="deleteVplspePool('<%= row.vplspe_name %>','<%=row.aic_site_id %>','<%= row.availability_zone %>','<%= row.physical_intf_name %>');">Delete</button>
-            </td>
-            <% } %>
-
-        </tr>
-    <% }); %>
-      </tbody>
-    </table>
-
-<!--
-	<% if(priv == 'A'){ %>
-	<div class="actions" style="padding:0px 25px;">
-	<form method="POST" action="/gamma/uploadVplspePool" enctype="multipart/form-data">
-		<div class="form-group">
-    		<label for="dest">File input</label>
-    		<input name="filename" type="file" id="dest">
-    		<p class="help-block">Choose a file to upload.</p>
-  		</div>
-		<% if(priv == 'A') { %>
-            <button type="button" class="btn btn-default"
-                onclick="uploadFile(this.form);">Upload File</button>
-        <% } else { %>
-            <button type="button" class="btn btn-default disabled"
-                onclick="uploadFile(this.form);">Upload File</button>
-        <% } %>
-
-	</form>
-	</div>
-	<% } %>
--->
-</div>
-
-<% include ../partials/update_vplspe_pool %>
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-<script type="text/javascript">
-function updateVplspePool(aic_site_id,availability_zone,vplspe_name,physical_intf_name,physical_intf_speed,physical_intf_units,loopback0_ipv4_address,vlan_id_outer,vplspe_uuid,image_filename,provisioning_status,vendor) {
-
-    document.getElementById('uf_aic_site_id').value=aic_site_id;
-    document.getElementById('uf_availability_zone').value=availability_zone
-    document.getElementById('uf_vplspe_name').value=vplspe_name;
-    document.getElementById('uf_physical_intf_name').value=physical_intf_name;
-    document.getElementById('uf_physical_intf_speed').value=physical_intf_speed;
-    document.getElementById('uf_physical_intf_units').value=physical_intf_units;
-    document.getElementById('uf_loopback0_ipv4_address').value=loopback0_ipv4_address;
-    document.getElementById('uf_vlan_id_outer').value=vlan_id_outer;
-    document.getElementById('uf_vplspe_uuid').value=vplspe_uuid;
-    document.getElementById('uf_image_filename').value=image_filename;
-    document.getElementById('uf_provisioning_status').value=provisioning_status;
-    document.getElementById('uf_vendor').value=vendor;
-
-    document.getElementById('uf_key_aic_site_id').value=aic_site_id;
-    document.getElementById('uf_key_vplspe_name').value=vplspe_name;
-    document.getElementById('uf_key_availability_zone').value=availability_zone
-    document.getElementById('uf_key_physical_intf_name').value=physical_intf_name;
-    $('#update_vplspe_pool_modal').modal('show');
-}
-
-function deleteVplspePool(vplspe_name,aic_site_id,availability_zone,physical_intf_name) {
-
-    bootbox.confirm({
-        message: "Are you sure you want to delete VPLSPE [" + vplspe_name + "][" + aic_site_id + "][" + availability_zone + "][" + physical_intf_name + "] ?",
-        callback: function(result) {
-            if ( result )
-            {
-                location.assign("/gamma/deleteVplspePool?aic_site_id=" + aic_site_id + "&vplspe_name=" + vplspe_name + "&availability_zone=" + availability_zone + "&physical_intf_name=" + physical_intf_name);
-            }
-            return;
-        },
-        buttons: {
-            cancel: {
-                label: "Cancel"
-            },
-            confirm: {
-                label: "Yes"
-            }
-        }
-    });
-}
-</script>
-
-</body>
-</html>
-
diff --git a/admportal/views/gamma/nbVlanPool.ejs b/admportal/views/gamma/nbVlanPool.ejs
deleted file mode 100644
index 9d3a8d1b..00000000
--- a/admportal/views/gamma/nbVlanPool.ejs
+++ /dev/null
@@ -1,124 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-
-<script class="init">
-    $(document).ready(function() {
-    $('#nb_vlan_pool').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>NetBond VLAN Pools</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-		if (result.code.length > 0) { 
-			if ( result.code == 'success' ) { %>
-				<div class='alert alert-success' role='alert'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } else { %> 
-				<div class='alert alert-danger' role='danger'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } %>
-		<% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){ 
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-<div class="container-fluid">
-
-	<table id="nb_vlan_pool" class="table table-hover table-condensed">
-      <thead>
-        <tr>
-          <th>AIC Site Id</th>
-          <th>Availability Zone</th>
-		  <th>VLAN Plan Id</th>
-		  <th>Plan Type</th>
-		  <th>Purpose</th>
-		  <th>VLAN Id</th>
-	      <th>Status</th>
-		  <% if(priv == 'A'){ %>
-		  <th>Action</th>
-		  <% } %>
-        </tr>
-      </thead>
-      <tbody>
-      <% rows.forEach( function(row) { %> 
-        <tr>
-            <td><%= row.aic_site_id %></td>
-            <td><%= row.availability_zone %></td>
-            <td><%= row.vlan_plan_id %></td>
-            <td><%= row.plan_type %></td>
-            <td><%= row.purpose %></td>
-            <td><%= row.vlan_id %></td>
-            <td><%= row.status %></td>
-			<% if(priv == 'A') { %>
-            <td>
-               	<button type="button" class="btn btn-default btn-xs" 
-					onclick="updateNbVlanPool('<%= row.aic_site_id %>', '<%= row.availability_zone %>',
-						'<%= row.vlan_plan_id %>', '<%= row.plan_type %>', '<%= row.purpose %>', 
-						'<%= row.vlan_id %>', '<%= row.status %>');">Update</button>
-            </td>
-            <% } else { %>
-				<td>&nbsp;</td>
-			<% } %>
-        </tr>
-    <% }); %>
-      </tbody>
-    </table>
-</div>
-
-<% include ../partials/nb_vlan_pool %>
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-<script type="text/javascript">
-
-function updateNbVlanPool(aic_site_id,availability_zone,vlan_plan_id,plan_type,purpose,vlan_id,pstatus) {
-
-    document.getElementById('uf_key_aic_site_id').value=aic_site_id;
-    document.getElementById('uf_key_availability_zone').value=availability_zone;
-    document.getElementById('uf_key_vlan_plan_id').value=vlan_plan_id;
-    document.getElementById('uf_key_plan_type').value=plan_type;
-    document.getElementById('uf_key_purpose').value=purpose;
-    document.getElementById('uf_key_vlan_id').value=vlan_id;
-    document.getElementById('uf_status').value=pstatus;
-
-    $('#update_nb_vlan_pool').modal('show');
-}
-
-function saveNbVlanPool(form)
-{
-   	form.submit();
-}
-
-</script>
-
-</body>
-</html>
-
diff --git a/admportal/views/gamma/nbVlanRange.ejs b/admportal/views/gamma/nbVlanRange.ejs
deleted file mode 100644
index 748dbbe3..00000000
--- a/admportal/views/gamma/nbVlanRange.ejs
+++ /dev/null
@@ -1,205 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-
-<script class="init">
-    $(document).ready(function() {
-    $('#nb_vlan_ranges').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>NetBond VLAN Ranges</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-		if (result.code.length > 0) { 
-			if ( result.code == 'success' ) { %>
-				<div class='alert alert-success' role='alert'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } else { %> 
-				<div class='alert alert-danger' role='danger'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } %>
-		<% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){ 
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-<div class="container-fluid">
-
-	 <% if(priv == 'A'){ %>
-        <div class="actions" style="padding:15px 0px;">
-            <button class="btn btn-primary" data-toggle="modal" data-target="#add_vlan_range">
-            Add Range
-            </button>
-        </div>
-    <% } %>
-
-	<table id="nb_vlan_ranges" class="table table-hover table-condensed">
-      <thead>
-        <tr>
-          <th>Vlan Plan Id</th>
-          <th>Purpose</th>
-		  <th>Range Start</th>
-		  <th>Range End</th>
-		  <th>Plan Type</th>
-	      <th>Pool Generated</th>
-		  <% if(priv == 'A'){ %>
-		  <th>Action</th>
-		  <% } %>
-        </tr>
-      </thead>
-      <tbody>
-      <% rows.forEach( function(row) { %> 
-        <tr>
-            <td><%= row.vlan_plan_id %></td>
-            <td><%= row.purpose %></td>
-            <td><%= row.range_start %></td>
-            <td><%= row.range_end %></td>
-            <td><%= row.plan_type %></td>
-            <td><%= row.generated %></td>
-            <td>
-				<% if (row.generated == 'N' && priv == 'A'){ %>
-               		<button type="button" class="btn btn-default btn-xs" onclick="generateVlanPool();">Generate Pool</button>
-				<% } else { %>
-               		<button type="button" class="btn btn-default btn-xs disabled" 
-					onclick="generateVlanPool('<%= row.purpose %>', '<%= row.vlan_plan_id %>',
-						'<%= row.range_start %>', '<%= row.range_end %>',
-						'<%= row.plan_type %>');">Generate Pool</button>
-				<% } %>
-				<% if (row.generated == 'N'){ %>
-               		<button type="button" class="btn btn-default btn-xs disabled" onclick="viewNbVlanPool('<%= row.vlan_plan_id %>','<%= row.range_start %>', '<%= row.range_end %>');">View Pool</button>
-				<% } else { %>
-               		<button type="button" class="btn btn-default btn-xs" onclick="viewNbVlanPool('<%= row.vlan_plan_id %>','<%= row.range_start %>', '<%= row.range_end %>');">View Pool</button>
-				<% } %>
-				<% if(priv == 'A') { %>
-               		<button type="button" class="btn btn-default btn-xs" 
-						onclick="deleteNbVlanRange('<%= row.vlan_plan_id %>',
-						'<%= row.plan_type %>', '<%= row.purpose %>', '<%= row.range_start %>',
-						'<%= row.range_end %>');">Delete</button>
-				<% } %>
-            </td>
-        </tr>
-    <% }); %>
-      </tbody>
-    </table>
-</div>
-
-<% include ../partials/nb_vlan_range %>
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-<script type="text/javascript">
-
-function generateVlanPool(purpose,vlan_plan_id,range_start,range_end,plan_type)
-{
-	var url_string = encodeURI("/gamma/generateNbVlanPool?vlan_plan_id=" + vlan_plan_id
-		+ "&range_start=" + range_start + "&range_end=" + range_end 
-		+ "&plan_type=" + plan_type + "&purpose=" + purpose);
-	location.assign(url_string);
-	return;
-}
-function viewNbVlanPool(vlan_plan_id, range_start, range_end)
-{
-	var url_string = encodeURI("/gamma/getNbVlanPool?vlan_plan_id=" + vlan_plan_id
-		+ "&range_start=" + range_start + "&range_end=" + range_end);
-	location.assign(url_string);
-	return;
-}
-function deleteNbVlanRange(vlan_plan_id,plan_type,purpose,range_start,range_end) {
-
-    bootbox.confirm({
-        message: "Are you sure you want to delete this VLAN Range[" + vlan_plan_id + "]",
-        callback: function(result) {
-            if ( result )
-            {
-				var url_string = encodeURI(
-					"/gamma/deleteNbVlanRange?vlan_plan_id=" + vlan_plan_id
-					+ "&plan_type=" + plan_type + "&purpose=" + purpose
-					+ "&range_start=" + range_start + "&range_end=" + range_end);
-                location.assign(url_string);
-            }
-            return;
-        },
-        buttons: {
-            cancel: {
-                label: "Cancel"
-            },
-            confirm: {
-                label: "Yes"
-            }
-        }
-    });
-}
-
-function saveNbVlanRange(form)
-{
-    var errorMsg='';
-    var plan_type = form.nf_plan_type.value;
-    var purpose = form.nf_purpose.value;
-	var range_start = form.nf_range_start.value;
-	var range_end = form.nf_range_end.value;
-
-    if ( (range_start == null) || (range_start == "") || isblank(range_start) )
-    {
-        errorMsg += 'Range Start is required.<br>';
-    }
-    if ( (range_end == null) || (range_end == "") || isblank(range_start) )
-    {
-        errorMsg += 'Range End is required.<br>';
-    }
-    if( errorMsg.length > 0 ) {
-        bootbox.alert(errorMsg);
-        return;
-    }
-
-	if ( !$.isNumeric(range_start) ) {
-        bootbox.alert('Range Start is not a number.');
-        return;
-    }
-	if ( !$.isNumeric(range_end) ) {
-        bootbox.alert('Range End is not a number.');
-        return;
-    }
-	var r_start = Number(range_start);
-	var r_end = Number(range_end);
-
-	if ( r_end < r_start )
-	{
-		bootbox.alert('Range End must be greater than Range Start.');
-		return;
-	}
-
-   	form.submit();
-}
-
-</script>
-
-</body>
-</html>
-
diff --git a/admportal/views/gamma/networkProfile.ejs b/admportal/views/gamma/networkProfile.ejs
deleted file mode 100644
index 1b54d671..00000000
--- a/admportal/views/gamma/networkProfile.ejs
+++ /dev/null
@@ -1,164 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-
-<script class="init"> 
-	$(document).ready(function() {
-    $('#network_profile').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>Network Profile</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-		if (result.code.length > 0) { 
-			if ( result.code == 'success' ) { %>
-				<div class='alert alert-success' role='alert'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } else { %> 
-				<div class='alert alert-danger' role='danger'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } %>
-		<% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-
-	 <% if(priv == 'A'){ %>
-        <div class="actions" style="padding:15px 0px;">
-            <button class="btn btn-primary btn-md" data-toggle="modal" data-target="#add_network_profile">
-            Add Profile 
-            </button>
-            </div>
-    <% } %>
-
-	<table id="network_profile" class="table table-hover table-condensed">
-      <thead>
-        <tr>
-		  <th>*Network Type</th>
-          <th>Technology</th>
-		   <% if(priv == 'A'){ %>
-          <th>Action</th>
-          <% } %>
-        </tr>
-      </thead>
-      <tbody>
-      <% rows.forEach( function(row) { %> 
-        <tr>
-            <td><%= row.network_type %></td>
-            <td><%= row.technology %></td>
-			<% if(priv == 'A') { %>
-            <td>
-				<% if (priv == 'A') { %>
-				<button type="button" class="btn btn-default btn-xs" onclick="updateNetworkProfile('<%= row.network_type %>', '<%= row.technology %>');">Update</button>
-				<button type="button" class="btn btn-default btn-xs" onclick="deleteNetworkProfile('<%= row.network_type %>');">Delete</button>
-				<% } %>
-            </td>
-            <% } %>
-
-        </tr>
-    <% }); %>
-      </tbody>
-    </table>
-</div>
-
-<% include ../partials/network_profile %>
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-<script type="text/javascript">
-function saveNetworkProfile(form)
-{
-    var errorMsg='';
-    var network_type = '';
-	var technology = '';
-
-    if ( form.name == 'addForm' )
-    {
-		network_type = form.nf_network_type;
-		technology = form.nf_technology;
-    }
-    else
-    {
-		network_type = form.uf_network_type;
-		technology = form.uf_technology;
-    }
-
-
-    if ( (network_type.value == null) || (network_type.value == "") || isblank(network_type.value) )
-    {
-        errorMsg += 'Network Type is required.<br>';
-    }
-    if( errorMsg.length > 0 ) {
-        bootbox.alert(errorMsg);
-        return;
-    }
-    form.submit();
-}
-
-function updateNetworkProfile(network_type,technology) {
-
-    document.getElementById('uf_network_type').value=network_type;
-    document.getElementById('uf_technology').value=technology;
-
-    document.getElementById('uf_key_network_type').value=network_type;
-
-    $('#update_network_profile').modal('show');
-}
-
-function deleteNetworkProfile(network_type) {
-
-    bootbox.confirm({
-        message: "Are you sure you want to delete this Network Profile [" + network_type + "]",
-        callback: function(result) {
-            if ( result )
-            {
-				location.assign("/gamma/deleteNetworkProfile?network_type=" + network_type);
-            }
-            return;
-        },
-        buttons: {
-            cancel: {
-                label: "Cancel"
-            },
-            confirm: {
-                label: "Yes"
-            }
-        }
-    });
-}
-
-</script>
-
-</body>
-</html>
-
diff --git a/admportal/views/javascript_delete/jquery.min.js b/admportal/views/javascript_delete/jquery.min.js
deleted file mode 100644
index ab28a247..00000000
--- a/admportal/views/javascript_delete/jquery.min.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/*! jQuery v1.11.1 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */
-!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l="1.11.1",m=function(a,b){return new m.fn.init(a,b)},n=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,o=/^-ms-/,p=/-([\da-z])/gi,q=function(a,b){return b.toUpperCase()};m.fn=m.prototype={jquery:l,constructor:m,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=m.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return m.each(this,a,b)},map:function(a){return this.pushStack(m.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},m.extend=m.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||m.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(m.isPlainObject(c)||(b=m.isArray(c)))?(b?(b=!1,f=a&&m.isArray(a)?a:[]):f=a&&m.isPlainObject(a)?a:{},g[d]=m.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},m.extend({expando:"jQuery"+(l+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===m.type(a)},isArray:Array.isArray||function(a){return"array"===m.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){return!m.isArray(a)&&a-parseFloat(a)>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==m.type(a)||a.nodeType||m.isWindow(a))return!1;try{if(a.constructor&&!j.call(a,"constructor")&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(k.ownLast)for(b in a)return j.call(a,b);for(b in a);return void 0===b||j.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(b){b&&m.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(o,"ms-").replace(p,q)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=r(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(n,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(r(Object(a))?m.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(g)return g.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=r(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(f=a[b],b=a,a=f),m.isFunction(a)?(c=d.call(arguments,2),e=function(){return a.apply(b||this,c.concat(d.call(arguments)))},e.guid=a.guid=a.guid||m.guid++,e):void 0},now:function(){return+new Date},support:k}),m.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function r(a){var b=a.length,c=m.type(a);return"function"===c||m.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var s=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+-new Date,v=a.document,w=0,x=0,y=gb(),z=gb(),A=gb(),B=function(a,b){return a===b&&(l=!0),0},C="undefined",D=1<<31,E={}.hasOwnProperty,F=[],G=F.pop,H=F.push,I=F.push,J=F.slice,K=F.indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1},L="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",N="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",O=N.replace("w","w#"),P="\\["+M+"*("+N+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+O+"))|)"+M+"*\\]",Q=":("+N+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+P+")*)|.*)\\)|)",R=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),S=new RegExp("^"+M+"*,"+M+"*"),T=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp("="+M+"*([^\\]'\"]*?)"+M+"*\\]","g"),V=new RegExp(Q),W=new RegExp("^"+O+"$"),X={ID:new RegExp("^#("+N+")"),CLASS:new RegExp("^\\.("+N+")"),TAG:new RegExp("^("+N.replace("w","w*")+")"),ATTR:new RegExp("^"+P),PSEUDO:new RegExp("^"+Q),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+L+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ab=/[+~]/,bb=/'|\\/g,cb=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),db=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)};try{I.apply(F=J.call(v.childNodes),v.childNodes),F[v.childNodes.length].nodeType}catch(eb){I={apply:F.length?function(a,b){H.apply(a,J.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fb(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],!a||"string"!=typeof a)return d;if(1!==(k=b.nodeType)&&9!==k)return[];if(p&&!e){if(f=_.exec(a))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return I.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName&&b.getElementsByClassName)return I.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=9===k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(bb,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+qb(o[l]);w=ab.test(a)&&ob(b.parentNode)||b,x=o.join(",")}if(x)try{return I.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function gb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function hb(a){return a[u]=!0,a}function ib(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function jb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function kb(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||D)-(~a.sourceIndex||D);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function lb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function mb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function nb(a){return hb(function(b){return b=+b,hb(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function ob(a){return a&&typeof a.getElementsByTagName!==C&&a}c=fb.support={},f=fb.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fb.setDocument=function(a){var b,e=a?a.ownerDocument||a:v,g=e.defaultView;return e!==n&&9===e.nodeType&&e.documentElement?(n=e,o=e.documentElement,p=!f(e),g&&g!==g.top&&(g.addEventListener?g.addEventListener("unload",function(){m()},!1):g.attachEvent&&g.attachEvent("onunload",function(){m()})),c.attributes=ib(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ib(function(a){return a.appendChild(e.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(e.getElementsByClassName)&&ib(function(a){return a.innerHTML="<div class='a'></div><div class='a i'></div>",a.firstChild.className="i",2===a.getElementsByClassName("i").length}),c.getById=ib(function(a){return o.appendChild(a).id=u,!e.getElementsByName||!e.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if(typeof b.getElementById!==C&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){var c=typeof a.getAttributeNode!==C&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return typeof b.getElementsByTagName!==C?b.getElementsByTagName(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return typeof b.getElementsByClassName!==C&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(e.querySelectorAll))&&(ib(function(a){a.innerHTML="<select msallowclip=''><option selected=''></option></select>",a.querySelectorAll("[msallowclip^='']").length&&q.push("[*^$]="+M+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+M+"*(?:value|"+L+")"),a.querySelectorAll(":checked").length||q.push(":checked")}),ib(function(a){var b=e.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+M+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ib(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",Q)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===e||a.ownerDocument===v&&t(v,a)?-1:b===e||b.ownerDocument===v&&t(v,b)?1:k?K.call(k,a)-K.call(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,f=a.parentNode,g=b.parentNode,h=[a],i=[b];if(!f||!g)return a===e?-1:b===e?1:f?-1:g?1:k?K.call(k,a)-K.call(k,b):0;if(f===g)return kb(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?kb(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},e):n},fb.matches=function(a,b){return fb(a,null,null,b)},fb.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fb(b,n,null,[a]).length>0},fb.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fb.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&E.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fb.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fb.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fb.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fb.selectors={cacheLength:50,createPseudo:hb,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(cb,db),a[3]=(a[3]||a[4]||a[5]||"").replace(cb,db),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fb.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fb.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(cb,db).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+M+")"+a+"("+M+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||typeof a.getAttribute!==C&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fb.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fb.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?hb(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=K.call(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:hb(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?hb(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:hb(function(a){return function(b){return fb(a,b).length>0}}),contains:hb(function(a){return function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:hb(function(a){return W.test(a||"")||fb.error("unsupported lang: "+a),a=a.replace(cb,db).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:nb(function(){return[0]}),last:nb(function(a,b){return[b-1]}),eq:nb(function(a,b,c){return[0>c?c+b:c]}),even:nb(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:nb(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:nb(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:nb(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=lb(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=mb(b);function pb(){}pb.prototype=d.filters=d.pseudos,d.setFilters=new pb,g=fb.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){(!c||(e=S.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=T.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(R," ")}),h=h.slice(c.length));for(g in d.filter)!(e=X[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?fb.error(a):z(a,i).slice(0)};function qb(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function rb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function sb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function tb(a,b,c){for(var d=0,e=b.length;e>d;d++)fb(a,b[d],c);return c}function ub(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function vb(a,b,c,d,e,f){return d&&!d[u]&&(d=vb(d)),e&&!e[u]&&(e=vb(e,f)),hb(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||tb(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ub(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ub(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?K.call(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ub(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):I.apply(g,r)})}function wb(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=rb(function(a){return a===b},h,!0),l=rb(function(a){return K.call(b,a)>-1},h,!0),m=[function(a,c,d){return!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d))}];f>i;i++)if(c=d.relative[a[i].type])m=[rb(sb(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return vb(i>1&&sb(m),i>1&&qb(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&wb(a.slice(i,e)),f>e&&wb(a=a.slice(e)),f>e&&qb(a))}m.push(c)}return sb(m)}function xb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=G.call(i));s=ub(s)}I.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&fb.uniqueSort(i)}return k&&(w=v,j=t),r};return c?hb(f):f}return h=fb.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wb(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xb(e,d)),f.selector=a}return f},i=fb.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(cb,db),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(cb,db),ab.test(j[0].type)&&ob(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qb(j),!a)return I.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,ab.test(a)&&ob(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ib(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ib(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||jb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ib(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||jb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ib(function(a){return null==a.getAttribute("disabled")})||jb(L,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fb}(a);m.find=s,m.expr=s.selectors,m.expr[":"]=m.expr.pseudos,m.unique=s.uniqueSort,m.text=s.getText,m.isXMLDoc=s.isXML,m.contains=s.contains;var t=m.expr.match.needsContext,u=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,v=/^.[^:#\[\.,]*$/;function w(a,b,c){if(m.isFunction(b))return m.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return m.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(v.test(b))return m.filter(b,a,c);b=m.filter(b,a)}return m.grep(a,function(a){return m.inArray(a,b)>=0!==c})}m.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?m.find.matchesSelector(d,a)?[d]:[]:m.find.matches(a,m.grep(b,function(a){return 1===a.nodeType}))},m.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(m(a).filter(function(){for(b=0;e>b;b++)if(m.contains(d[b],this))return!0}));for(b=0;e>b;b++)m.find(a,d[b],c);return c=this.pushStack(e>1?m.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(w(this,a||[],!1))},not:function(a){return this.pushStack(w(this,a||[],!0))},is:function(a){return!!w(this,"string"==typeof a&&t.test(a)?m(a):a||[],!1).length}});var x,y=a.document,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=m.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||x).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof m?b[0]:b,m.merge(this,m.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:y,!0)),u.test(c[1])&&m.isPlainObject(b))for(c in b)m.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}if(d=y.getElementById(c[2]),d&&d.parentNode){if(d.id!==c[2])return x.find(a);this.length=1,this[0]=d}return this.context=y,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):m.isFunction(a)?"undefined"!=typeof x.ready?x.ready(a):a(m):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),m.makeArray(a,this))};A.prototype=m.fn,x=m(y);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};m.extend({dir:function(a,b,c){var d=[],e=a[b];while(e&&9!==e.nodeType&&(void 0===c||1!==e.nodeType||!m(e).is(c)))1===e.nodeType&&d.push(e),e=e[b];return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),m.fn.extend({has:function(a){var b,c=m(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(m.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=t.test(a)||"string"!=typeof a?m(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&m.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?m.unique(f):f)},index:function(a){return a?"string"==typeof a?m.inArray(this[0],m(a)):m.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(m.unique(m.merge(this.get(),m(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}m.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return m.dir(a,"parentNode")},parentsUntil:function(a,b,c){return m.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return m.dir(a,"nextSibling")},prevAll:function(a){return m.dir(a,"previousSibling")},nextUntil:function(a,b,c){return m.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return m.dir(a,"previousSibling",c)},siblings:function(a){return m.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return m.sibling(a.firstChild)},contents:function(a){return m.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:m.merge([],a.childNodes)}},function(a,b){m.fn[a]=function(c,d){var e=m.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=m.filter(d,e)),this.length>1&&(C[a]||(e=m.unique(e)),B.test(a)&&(e=e.reverse())),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return m.each(a.match(E)||[],function(a,c){b[c]=!0}),b}m.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):m.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(c=a.memory&&l,d=!0,f=g||0,g=0,e=h.length,b=!0;h&&e>f;f++)if(h[f].apply(l[0],l[1])===!1&&a.stopOnFalse){c=!1;break}b=!1,h&&(i?i.length&&j(i.shift()):c?h=[]:k.disable())},k={add:function(){if(h){var d=h.length;!function f(b){m.each(b,function(b,c){var d=m.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&f(c)})}(arguments),b?e=h.length:c&&(g=d,j(c))}return this},remove:function(){return h&&m.each(arguments,function(a,c){var d;while((d=m.inArray(c,h,d))>-1)h.splice(d,1),b&&(e>=d&&e--,f>=d&&f--)}),this},has:function(a){return a?m.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],e=0,this},disable:function(){return h=i=c=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,c||k.disable(),this},locked:function(){return!i},fireWith:function(a,c){return!h||d&&!i||(c=c||[],c=[a,c.slice?c.slice():c],b?i.push(c):j(c)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!d}};return k},m.extend({Deferred:function(a){var b=[["resolve","done",m.Callbacks("once memory"),"resolved"],["reject","fail",m.Callbacks("once memory"),"rejected"],["notify","progress",m.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return m.Deferred(function(c){m.each(b,function(b,f){var g=m.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&m.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?m.extend(a,d):d}},e={};return d.pipe=d.then,m.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&m.isFunction(a.promise)?e:0,g=1===f?a:m.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&m.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;m.fn.ready=function(a){return m.ready.promise().done(a),this},m.extend({isReady:!1,readyWait:1,holdReady:function(a){a?m.readyWait++:m.ready(!0)},ready:function(a){if(a===!0?!--m.readyWait:!m.isReady){if(!y.body)return setTimeout(m.ready);m.isReady=!0,a!==!0&&--m.readyWait>0||(H.resolveWith(y,[m]),m.fn.triggerHandler&&(m(y).triggerHandler("ready"),m(y).off("ready")))}}});function I(){y.addEventListener?(y.removeEventListener("DOMContentLoaded",J,!1),a.removeEventListener("load",J,!1)):(y.detachEvent("onreadystatechange",J),a.detachEvent("onload",J))}function J(){(y.addEventListener||"load"===event.type||"complete"===y.readyState)&&(I(),m.ready())}m.ready.promise=function(b){if(!H)if(H=m.Deferred(),"complete"===y.readyState)setTimeout(m.ready);else if(y.addEventListener)y.addEventListener("DOMContentLoaded",J,!1),a.addEventListener("load",J,!1);else{y.attachEvent("onreadystatechange",J),a.attachEvent("onload",J);var c=!1;try{c=null==a.frameElement&&y.documentElement}catch(d){}c&&c.doScroll&&!function e(){if(!m.isReady){try{c.doScroll("left")}catch(a){return setTimeout(e,50)}I(),m.ready()}}()}return H.promise(b)};var K="undefined",L;for(L in m(k))break;k.ownLast="0"!==L,k.inlineBlockNeedsLayout=!1,m(function(){var a,b,c,d;c=y.getElementsByTagName("body")[0],c&&c.style&&(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==K&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",k.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(d))}),function(){var a=y.createElement("div");if(null==k.deleteExpando){k.deleteExpando=!0;try{delete a.test}catch(b){k.deleteExpando=!1}}a=null}(),m.acceptData=function(a){var b=m.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b};var M=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,N=/([A-Z])/g;function O(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(N,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:M.test(c)?m.parseJSON(c):c}catch(e){}m.data(a,b,c)}else c=void 0}return c}function P(a){var b;for(b in a)if(("data"!==b||!m.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;return!0}function Q(a,b,d,e){if(m.acceptData(a)){var f,g,h=m.expando,i=a.nodeType,j=i?m.cache:a,k=i?a[h]:a[h]&&h;
-if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||m.guid++:h),j[k]||(j[k]=i?{}:{toJSON:m.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=m.extend(j[k],b):j[k].data=m.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[m.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[m.camelCase(b)])):f=g,f}}function R(a,b,c){if(m.acceptData(a)){var d,e,f=a.nodeType,g=f?m.cache:a,h=f?a[m.expando]:m.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){m.isArray(b)?b=b.concat(m.map(b,m.camelCase)):b in d?b=[b]:(b=m.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!P(d):!m.isEmptyObject(d))return}(c||(delete g[h].data,P(g[h])))&&(f?m.cleanData([a],!0):k.deleteExpando||g!=g.window?delete g[h]:g[h]=null)}}}m.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?m.cache[a[m.expando]]:a[m.expando],!!a&&!P(a)},data:function(a,b,c){return Q(a,b,c)},removeData:function(a,b){return R(a,b)},_data:function(a,b,c){return Q(a,b,c,!0)},_removeData:function(a,b){return R(a,b,!0)}}),m.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=m.data(f),1===f.nodeType&&!m._data(f,"parsedAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=m.camelCase(d.slice(5)),O(f,d,e[d])));m._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){m.data(this,a)}):arguments.length>1?this.each(function(){m.data(this,a,b)}):f?O(f,a,m.data(f,a)):void 0},removeData:function(a){return this.each(function(){m.removeData(this,a)})}}),m.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=m._data(a,b),c&&(!d||m.isArray(c)?d=m._data(a,b,m.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=m.queue(a,b),d=c.length,e=c.shift(),f=m._queueHooks(a,b),g=function(){m.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return m._data(a,c)||m._data(a,c,{empty:m.Callbacks("once memory").add(function(){m._removeData(a,b+"queue"),m._removeData(a,c)})})}}),m.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?m.queue(this[0],a):void 0===b?this:this.each(function(){var c=m.queue(this,a,b);m._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&m.dequeue(this,a)})},dequeue:function(a){return this.each(function(){m.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=m.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=m._data(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var S=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=["Top","Right","Bottom","Left"],U=function(a,b){return a=b||a,"none"===m.css(a,"display")||!m.contains(a.ownerDocument,a)},V=m.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===m.type(c)){e=!0;for(h in c)m.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,m.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(m(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},W=/^(?:checkbox|radio)$/i;!function(){var a=y.createElement("input"),b=y.createElement("div"),c=y.createDocumentFragment();if(b.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",k.leadingWhitespace=3===b.firstChild.nodeType,k.tbody=!b.getElementsByTagName("tbody").length,k.htmlSerialize=!!b.getElementsByTagName("link").length,k.html5Clone="<:nav></:nav>"!==y.createElement("nav").cloneNode(!0).outerHTML,a.type="checkbox",a.checked=!0,c.appendChild(a),k.appendChecked=a.checked,b.innerHTML="<textarea>x</textarea>",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue,c.appendChild(b),b.innerHTML="<input type='radio' checked='checked' name='t'/>",k.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,k.noCloneEvent=!0,b.attachEvent&&(b.attachEvent("onclick",function(){k.noCloneEvent=!1}),b.cloneNode(!0).click()),null==k.deleteExpando){k.deleteExpando=!0;try{delete b.test}catch(d){k.deleteExpando=!1}}}(),function(){var b,c,d=y.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(k[b+"Bubbles"]=c in a)||(d.setAttribute(c,"t"),k[b+"Bubbles"]=d.attributes[c].expando===!1);d=null}();var X=/^(?:input|select|textarea)$/i,Y=/^key/,Z=/^(?:mouse|pointer|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=/^([^.]*)(?:\.(.+)|)$/;function ab(){return!0}function bb(){return!1}function cb(){try{return y.activeElement}catch(a){}}m.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=m.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return typeof m===K||a&&m.event.triggered===a.type?void 0:m.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(E)||[""],h=b.length;while(h--)f=_.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=m.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=m.event.special[o]||{},l=m.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&m.expr.match.needsContext.test(e),namespace:p.join(".")},i),(n=g[o])||(n=g[o]=[],n.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?n.splice(n.delegateCount++,0,l):n.push(l),m.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m.hasData(a)&&m._data(a);if(r&&(k=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=_.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=m.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,n=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=n.length;while(f--)g=n[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(n.splice(f,1),g.selector&&n.delegateCount--,l.remove&&l.remove.call(a,g));i&&!n.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||m.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)m.event.remove(a,o+b[j],c,d,!0);m.isEmptyObject(k)&&(delete r.handle,m._removeData(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,l,n,o=[d||y],p=j.call(b,"type")?b.type:b,q=j.call(b,"namespace")?b.namespace.split("."):[];if(h=l=d=d||y,3!==d.nodeType&&8!==d.nodeType&&!$.test(p+m.event.triggered)&&(p.indexOf(".")>=0&&(q=p.split("."),p=q.shift(),q.sort()),g=p.indexOf(":")<0&&"on"+p,b=b[m.expando]?b:new m.Event(p,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=q.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:m.makeArray(c,[b]),k=m.event.special[p]||{},e||!k.trigger||k.trigger.apply(d,c)!==!1)){if(!e&&!k.noBubble&&!m.isWindow(d)){for(i=k.delegateType||p,$.test(i+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),l=h;l===(d.ownerDocument||y)&&o.push(l.defaultView||l.parentWindow||a)}n=0;while((h=o[n++])&&!b.isPropagationStopped())b.type=n>1?i:k.bindType||p,f=(m._data(h,"events")||{})[b.type]&&m._data(h,"handle"),f&&f.apply(h,c),f=g&&h[g],f&&f.apply&&m.acceptData(h)&&(b.result=f.apply(h,c),b.result===!1&&b.preventDefault());if(b.type=p,!e&&!b.isDefaultPrevented()&&(!k._default||k._default.apply(o.pop(),c)===!1)&&m.acceptData(d)&&g&&d[p]&&!m.isWindow(d)){l=d[g],l&&(d[g]=null),m.event.triggered=p;try{d[p]()}catch(r){}m.event.triggered=void 0,l&&(d[g]=l)}return b.result}},dispatch:function(a){a=m.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(m._data(this,"events")||{})[a.type]||[],k=m.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=m.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,g=0;while((e=f.handlers[g++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(e.namespace))&&(a.handleObj=e,a.data=e.data,c=((m.event.special[e.origType]||{}).handle||e.handler).apply(f.elem,i),void 0!==c&&(a.result=c)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(e=[],f=0;h>f;f++)d=b[f],c=d.selector+" ",void 0===e[c]&&(e[c]=d.needsContext?m(c,this).index(i)>=0:m.find(c,this,null,[i]).length),e[c]&&e.push(d);e.length&&g.push({elem:i,handlers:e})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},fix:function(a){if(a[m.expando])return a;var b,c,d,e=a.type,f=a,g=this.fixHooks[e];g||(this.fixHooks[e]=g=Z.test(e)?this.mouseHooks:Y.test(e)?this.keyHooks:{}),d=g.props?this.props.concat(g.props):this.props,a=new m.Event(f),b=d.length;while(b--)c=d[b],a[c]=f[c];return a.target||(a.target=f.srcElement||y),3===a.target.nodeType&&(a.target=a.target.parentNode),a.metaKey=!!a.metaKey,g.filter?g.filter(a,f):a},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,d,e,f=b.button,g=b.fromElement;return null==a.pageX&&null!=b.clientX&&(d=a.target.ownerDocument||y,e=d.documentElement,c=d.body,a.pageX=b.clientX+(e&&e.scrollLeft||c&&c.scrollLeft||0)-(e&&e.clientLeft||c&&c.clientLeft||0),a.pageY=b.clientY+(e&&e.scrollTop||c&&c.scrollTop||0)-(e&&e.clientTop||c&&c.clientTop||0)),!a.relatedTarget&&g&&(a.relatedTarget=g===a.target?b.toElement:g),a.which||void 0===f||(a.which=1&f?1:2&f?3:4&f?2:0),a}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==cb()&&this.focus)try{return this.focus(),!1}catch(a){}},delegateType:"focusin"},blur:{trigger:function(){return this===cb()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return m.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):void 0},_default:function(a){return m.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c,d){var e=m.extend(new m.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?m.event.trigger(e,null,b):m.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},m.removeEvent=y.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){var d="on"+b;a.detachEvent&&(typeof a[d]===K&&(a[d]=null),a.detachEvent(d,c))},m.Event=function(a,b){return this instanceof m.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?ab:bb):this.type=a,b&&m.extend(this,b),this.timeStamp=a&&a.timeStamp||m.now(),void(this[m.expando]=!0)):new m.Event(a,b)},m.Event.prototype={isDefaultPrevented:bb,isPropagationStopped:bb,isImmediatePropagationStopped:bb,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=ab,a&&(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=ab,a&&(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=ab,a&&a.stopImmediatePropagation&&a.stopImmediatePropagation(),this.stopPropagation()}},m.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){m.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return(!e||e!==d&&!m.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),k.submitBubbles||(m.event.special.submit={setup:function(){return m.nodeName(this,"form")?!1:void m.event.add(this,"click._submit keypress._submit",function(a){var b=a.target,c=m.nodeName(b,"input")||m.nodeName(b,"button")?b.form:void 0;c&&!m._data(c,"submitBubbles")&&(m.event.add(c,"submit._submit",function(a){a._submit_bubble=!0}),m._data(c,"submitBubbles",!0))})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&m.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){return m.nodeName(this,"form")?!1:void m.event.remove(this,"._submit")}}),k.changeBubbles||(m.event.special.change={setup:function(){return X.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(m.event.add(this,"propertychange._change",function(a){"checked"===a.originalEvent.propertyName&&(this._just_changed=!0)}),m.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1),m.event.simulate("change",this,a,!0)})),!1):void m.event.add(this,"beforeactivate._change",function(a){var b=a.target;X.test(b.nodeName)&&!m._data(b,"changeBubbles")&&(m.event.add(b,"change._change",function(a){!this.parentNode||a.isSimulated||a.isTrigger||m.event.simulate("change",this.parentNode,a,!0)}),m._data(b,"changeBubbles",!0))})},handle:function(a){var b=a.target;return this!==b||a.isSimulated||a.isTrigger||"radio"!==b.type&&"checkbox"!==b.type?a.handleObj.handler.apply(this,arguments):void 0},teardown:function(){return m.event.remove(this,"._change"),!X.test(this.nodeName)}}),k.focusinBubbles||m.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){m.event.simulate(b,a.target,m.event.fix(a),!0)};m.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=m._data(d,b);e||d.addEventListener(a,c,!0),m._data(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=m._data(d,b)-1;e?m._data(d,b,e):(d.removeEventListener(a,c,!0),m._removeData(d,b))}}}),m.fn.extend({on:function(a,b,c,d,e){var f,g;if("object"==typeof a){"string"!=typeof b&&(c=c||b,b=void 0);for(f in a)this.on(f,b,c,a[f],e);return this}if(null==c&&null==d?(d=b,c=b=void 0):null==d&&("string"==typeof b?(d=c,c=void 0):(d=c,c=b,b=void 0)),d===!1)d=bb;else if(!d)return this;return 1===e&&(g=d,d=function(a){return m().off(a),g.apply(this,arguments)},d.guid=g.guid||(g.guid=m.guid++)),this.each(function(){m.event.add(this,a,d,c,b)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,m(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return(b===!1||"function"==typeof b)&&(c=b,b=void 0),c===!1&&(c=bb),this.each(function(){m.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){m.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?m.event.trigger(a,b,c,!0):void 0}});function db(a){var b=eb.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}var eb="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",fb=/ jQuery\d+="(?:null|\d+)"/g,gb=new RegExp("<(?:"+eb+")[\\s/>]","i"),hb=/^\s+/,ib=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,jb=/<([\w:]+)/,kb=/<tbody/i,lb=/<|&#?\w+;/,mb=/<(?:script|style|link)/i,nb=/checked\s*(?:[^=]|=\s*.checked.)/i,ob=/^$|\/(?:java|ecma)script/i,pb=/^true\/(.*)/,qb=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,rb={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:k.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},sb=db(y),tb=sb.appendChild(y.createElement("div"));rb.optgroup=rb.option,rb.tbody=rb.tfoot=rb.colgroup=rb.caption=rb.thead,rb.th=rb.td;function ub(a,b){var c,d,e=0,f=typeof a.getElementsByTagName!==K?a.getElementsByTagName(b||"*"):typeof a.querySelectorAll!==K?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||m.nodeName(d,b)?f.push(d):m.merge(f,ub(d,b));return void 0===b||b&&m.nodeName(a,b)?m.merge([a],f):f}function vb(a){W.test(a.type)&&(a.defaultChecked=a.checked)}function wb(a,b){return m.nodeName(a,"table")&&m.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function xb(a){return a.type=(null!==m.find.attr(a,"type"))+"/"+a.type,a}function yb(a){var b=pb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function zb(a,b){for(var c,d=0;null!=(c=a[d]);d++)m._data(c,"globalEval",!b||m._data(b[d],"globalEval"))}function Ab(a,b){if(1===b.nodeType&&m.hasData(a)){var c,d,e,f=m._data(a),g=m._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)m.event.add(b,c,h[c][d])}g.data&&(g.data=m.extend({},g.data))}}function Bb(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!k.noCloneEvent&&b[m.expando]){e=m._data(b);for(d in e.events)m.removeEvent(b,d,e.handle);b.removeAttribute(m.expando)}"script"===c&&b.text!==a.text?(xb(b).text=a.text,yb(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),k.html5Clone&&a.innerHTML&&!m.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&W.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}m.extend({clone:function(a,b,c){var d,e,f,g,h,i=m.contains(a.ownerDocument,a);if(k.html5Clone||m.isXMLDoc(a)||!gb.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(tb.innerHTML=a.outerHTML,tb.removeChild(f=tb.firstChild)),!(k.noCloneEvent&&k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||m.isXMLDoc(a)))for(d=ub(f),h=ub(a),g=0;null!=(e=h[g]);++g)d[g]&&Bb(e,d[g]);if(b)if(c)for(h=h||ub(a),d=d||ub(f),g=0;null!=(e=h[g]);g++)Ab(e,d[g]);else Ab(a,f);return d=ub(f,"script"),d.length>0&&zb(d,!i&&ub(a,"script")),d=h=e=null,f},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,l,n=a.length,o=db(b),p=[],q=0;n>q;q++)if(f=a[q],f||0===f)if("object"===m.type(f))m.merge(p,f.nodeType?[f]:f);else if(lb.test(f)){h=h||o.appendChild(b.createElement("div")),i=(jb.exec(f)||["",""])[1].toLowerCase(),l=rb[i]||rb._default,h.innerHTML=l[1]+f.replace(ib,"<$1></$2>")+l[2],e=l[0];while(e--)h=h.lastChild;if(!k.leadingWhitespace&&hb.test(f)&&p.push(b.createTextNode(hb.exec(f)[0])),!k.tbody){f="table"!==i||kb.test(f)?"<table>"!==l[1]||kb.test(f)?0:h:h.firstChild,e=f&&f.childNodes.length;while(e--)m.nodeName(j=f.childNodes[e],"tbody")&&!j.childNodes.length&&f.removeChild(j)}m.merge(p,h.childNodes),h.textContent="";while(h.firstChild)h.removeChild(h.firstChild);h=o.lastChild}else p.push(b.createTextNode(f));h&&o.removeChild(h),k.appendChecked||m.grep(ub(p,"input"),vb),q=0;while(f=p[q++])if((!d||-1===m.inArray(f,d))&&(g=m.contains(f.ownerDocument,f),h=ub(o.appendChild(f),"script"),g&&zb(h),c)){e=0;while(f=h[e++])ob.test(f.type||"")&&c.push(f)}return h=null,o},cleanData:function(a,b){for(var d,e,f,g,h=0,i=m.expando,j=m.cache,l=k.deleteExpando,n=m.event.special;null!=(d=a[h]);h++)if((b||m.acceptData(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)n[e]?m.event.remove(d,e):m.removeEvent(d,e,g.handle);j[f]&&(delete j[f],l?delete d[i]:typeof d.removeAttribute!==K?d.removeAttribute(i):d[i]=null,c.push(f))}}}),m.fn.extend({text:function(a){return V(this,function(a){return void 0===a?m.text(this):this.empty().append((this[0]&&this[0].ownerDocument||y).createTextNode(a))},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?m.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||m.cleanData(ub(c)),c.parentNode&&(b&&m.contains(c.ownerDocument,c)&&zb(ub(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&m.cleanData(ub(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&m.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return m.clone(this,a,b)})},html:function(a){return V(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(fb,""):void 0;if(!("string"!=typeof a||mb.test(a)||!k.htmlSerialize&&gb.test(a)||!k.leadingWhitespace&&hb.test(a)||rb[(jb.exec(a)||["",""])[1].toLowerCase()])){a=a.replace(ib,"<$1></$2>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(m.cleanData(ub(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,m.cleanData(ub(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,n=this,o=l-1,p=a[0],q=m.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&nb.test(p))return this.each(function(c){var d=n.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(i=m.buildFragment(a,this[0].ownerDocument,!1,this),c=i.firstChild,1===i.childNodes.length&&(i=c),c)){for(g=m.map(ub(i,"script"),xb),f=g.length;l>j;j++)d=i,j!==o&&(d=m.clone(d,!0,!0),f&&m.merge(g,ub(d,"script"))),b.call(this[j],d,j);if(f)for(h=g[g.length-1].ownerDocument,m.map(g,yb),j=0;f>j;j++)d=g[j],ob.test(d.type||"")&&!m._data(d,"globalEval")&&m.contains(h,d)&&(d.src?m._evalUrl&&m._evalUrl(d.src):m.globalEval((d.text||d.textContent||d.innerHTML||"").replace(qb,"")));i=c=null}return this}}),m.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){m.fn[a]=function(a){for(var c,d=0,e=[],g=m(a),h=g.length-1;h>=d;d++)c=d===h?this:this.clone(!0),m(g[d])[b](c),f.apply(e,c.get());return this.pushStack(e)}});var Cb,Db={};function Eb(b,c){var d,e=m(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:m.css(e[0],"display");return e.detach(),f}function Fb(a){var b=y,c=Db[a];return c||(c=Eb(a,b),"none"!==c&&c||(Cb=(Cb||m("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=(Cb[0].contentWindow||Cb[0].contentDocument).document,b.write(),b.close(),c=Eb(a,b),Cb.detach()),Db[a]=c),c}!function(){var a;k.shrinkWrapBlocks=function(){if(null!=a)return a;a=!1;var b,c,d;return c=y.getElementsByTagName("body")[0],c&&c.style?(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==K&&(b.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:1px;width:1px;zoom:1",b.appendChild(y.createElement("div")).style.width="5px",a=3!==b.offsetWidth),c.removeChild(d),a):void 0}}();var Gb=/^margin/,Hb=new RegExp("^("+S+")(?!px)[a-z%]+$","i"),Ib,Jb,Kb=/^(top|right|bottom|left)$/;a.getComputedStyle?(Ib=function(a){return a.ownerDocument.defaultView.getComputedStyle(a,null)},Jb=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Ib(a),g=c?c.getPropertyValue(b)||c[b]:void 0,c&&(""!==g||m.contains(a.ownerDocument,a)||(g=m.style(a,b)),Hb.test(g)&&Gb.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0===g?g:g+""}):y.documentElement.currentStyle&&(Ib=function(a){return a.currentStyle},Jb=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Ib(a),g=c?c[b]:void 0,null==g&&h&&h[b]&&(g=h[b]),Hb.test(g)&&!Kb.test(b)&&(d=h.left,e=a.runtimeStyle,f=e&&e.left,f&&(e.left=a.currentStyle.left),h.left="fontSize"===b?"1em":g,g=h.pixelLeft+"px",h.left=d,f&&(e.left=f)),void 0===g?g:g+""||"auto"});function Lb(a,b){return{get:function(){var c=a();if(null!=c)return c?void delete this.get:(this.get=b).apply(this,arguments)}}}!function(){var b,c,d,e,f,g,h;if(b=y.createElement("div"),b.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",d=b.getElementsByTagName("a")[0],c=d&&d.style){c.cssText="float:left;opacity:.5",k.opacity="0.5"===c.opacity,k.cssFloat=!!c.cssFloat,b.style.backgroundClip="content-box",b.cloneNode(!0).style.backgroundClip="",k.clearCloneStyle="content-box"===b.style.backgroundClip,k.boxSizing=""===c.boxSizing||""===c.MozBoxSizing||""===c.WebkitBoxSizing,m.extend(k,{reliableHiddenOffsets:function(){return null==g&&i(),g},boxSizingReliable:function(){return null==f&&i(),f},pixelPosition:function(){return null==e&&i(),e},reliableMarginRight:function(){return null==h&&i(),h}});function i(){var b,c,d,i;c=y.getElementsByTagName("body")[0],c&&c.style&&(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),b.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;display:block;margin-top:1%;top:1%;border:1px;padding:1px;width:4px;position:absolute",e=f=!1,h=!0,a.getComputedStyle&&(e="1%"!==(a.getComputedStyle(b,null)||{}).top,f="4px"===(a.getComputedStyle(b,null)||{width:"4px"}).width,i=b.appendChild(y.createElement("div")),i.style.cssText=b.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",i.style.marginRight=i.style.width="0",b.style.width="1px",h=!parseFloat((a.getComputedStyle(i,null)||{}).marginRight)),b.innerHTML="<table><tr><td></td><td>t</td></tr></table>",i=b.getElementsByTagName("td"),i[0].style.cssText="margin:0;border:0;padding:0;display:none",g=0===i[0].offsetHeight,g&&(i[0].style.display="",i[1].style.display="none",g=0===i[0].offsetHeight),c.removeChild(d))}}}(),m.swap=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};var Mb=/alpha\([^)]*\)/i,Nb=/opacity\s*=\s*([^)]*)/,Ob=/^(none|table(?!-c[ea]).+)/,Pb=new RegExp("^("+S+")(.*)$","i"),Qb=new RegExp("^([+-])=("+S+")","i"),Rb={position:"absolute",visibility:"hidden",display:"block"},Sb={letterSpacing:"0",fontWeight:"400"},Tb=["Webkit","O","Moz","ms"];function Ub(a,b){if(b in a)return b;var c=b.charAt(0).toUpperCase()+b.slice(1),d=b,e=Tb.length;while(e--)if(b=Tb[e]+c,b in a)return b;return d}function Vb(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=m._data(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&U(d)&&(f[g]=m._data(d,"olddisplay",Fb(d.nodeName)))):(e=U(d),(c&&"none"!==c||!e)&&m._data(d,"olddisplay",e?c:m.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}function Wb(a,b,c){var d=Pb.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function Xb(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=m.css(a,c+T[f],!0,e)),d?("content"===c&&(g-=m.css(a,"padding"+T[f],!0,e)),"margin"!==c&&(g-=m.css(a,"border"+T[f]+"Width",!0,e))):(g+=m.css(a,"padding"+T[f],!0,e),"padding"!==c&&(g+=m.css(a,"border"+T[f]+"Width",!0,e)));return g}function Yb(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=Ib(a),g=k.boxSizing&&"border-box"===m.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=Jb(a,b,f),(0>e||null==e)&&(e=a.style[b]),Hb.test(e))return e;d=g&&(k.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Xb(a,b,c||(g?"border":"content"),d,f)+"px"}m.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Jb(a,"opacity");return""===c?"1":c}}}},cssNumber:{columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":k.cssFloat?"cssFloat":"styleFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=m.camelCase(b),i=a.style;if(b=m.cssProps[h]||(m.cssProps[h]=Ub(i,h)),g=m.cssHooks[b]||m.cssHooks[h],void 0===c)return g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b];if(f=typeof c,"string"===f&&(e=Qb.exec(c))&&(c=(e[1]+1)*e[2]+parseFloat(m.css(a,b)),f="number"),null!=c&&c===c&&("number"!==f||m.cssNumber[h]||(c+="px"),k.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),!(g&&"set"in g&&void 0===(c=g.set(a,c,d)))))try{i[b]=c}catch(j){}}},css:function(a,b,c,d){var e,f,g,h=m.camelCase(b);return b=m.cssProps[h]||(m.cssProps[h]=Ub(a.style,h)),g=m.cssHooks[b]||m.cssHooks[h],g&&"get"in g&&(f=g.get(a,!0,c)),void 0===f&&(f=Jb(a,b,d)),"normal"===f&&b in Sb&&(f=Sb[b]),""===c||c?(e=parseFloat(f),c===!0||m.isNumeric(e)?e||0:f):f}}),m.each(["height","width"],function(a,b){m.cssHooks[b]={get:function(a,c,d){return c?Ob.test(m.css(a,"display"))&&0===a.offsetWidth?m.swap(a,Rb,function(){return Yb(a,b,d)}):Yb(a,b,d):void 0},set:function(a,c,d){var e=d&&Ib(a);return Wb(a,c,d?Xb(a,b,d,k.boxSizing&&"border-box"===m.css(a,"boxSizing",!1,e),e):0)}}}),k.opacity||(m.cssHooks.opacity={get:function(a,b){return Nb.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=m.isNumeric(b)?"alpha(opacity="+100*b+")":"",f=d&&d.filter||c.filter||"";c.zoom=1,(b>=1||""===b)&&""===m.trim(f.replace(Mb,""))&&c.removeAttribute&&(c.removeAttribute("filter"),""===b||d&&!d.filter)||(c.filter=Mb.test(f)?f.replace(Mb,e):f+" "+e)}}),m.cssHooks.marginRight=Lb(k.reliableMarginRight,function(a,b){return b?m.swap(a,{display:"inline-block"},Jb,[a,"marginRight"]):void 0}),m.each({margin:"",padding:"",border:"Width"},function(a,b){m.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+T[d]+b]=f[d]||f[d-2]||f[0];return e}},Gb.test(a)||(m.cssHooks[a+b].set=Wb)}),m.fn.extend({css:function(a,b){return V(this,function(a,b,c){var d,e,f={},g=0;if(m.isArray(b)){for(d=Ib(a),e=b.length;e>g;g++)f[b[g]]=m.css(a,b[g],!1,d);return f}return void 0!==c?m.style(a,b,c):m.css(a,b)},a,b,arguments.length>1)},show:function(){return Vb(this,!0)},hide:function(){return Vb(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){U(this)?m(this).show():m(this).hide()})}});function Zb(a,b,c,d,e){return new Zb.prototype.init(a,b,c,d,e)}m.Tween=Zb,Zb.prototype={constructor:Zb,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(m.cssNumber[c]?"":"px")
-},cur:function(){var a=Zb.propHooks[this.prop];return a&&a.get?a.get(this):Zb.propHooks._default.get(this)},run:function(a){var b,c=Zb.propHooks[this.prop];return this.pos=b=this.options.duration?m.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Zb.propHooks._default.set(this),this}},Zb.prototype.init.prototype=Zb.prototype,Zb.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=m.css(a.elem,a.prop,""),b&&"auto"!==b?b:0):a.elem[a.prop]},set:function(a){m.fx.step[a.prop]?m.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[m.cssProps[a.prop]]||m.cssHooks[a.prop])?m.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},Zb.propHooks.scrollTop=Zb.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},m.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},m.fx=Zb.prototype.init,m.fx.step={};var $b,_b,ac=/^(?:toggle|show|hide)$/,bc=new RegExp("^(?:([+-])=|)("+S+")([a-z%]*)$","i"),cc=/queueHooks$/,dc=[ic],ec={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=bc.exec(b),f=e&&e[3]||(m.cssNumber[a]?"":"px"),g=(m.cssNumber[a]||"px"!==f&&+d)&&bc.exec(m.css(c.elem,a)),h=1,i=20;if(g&&g[3]!==f){f=f||g[3],e=e||[],g=+d||1;do h=h||".5",g/=h,m.style(c.elem,a,g+f);while(h!==(h=c.cur()/d)&&1!==h&&--i)}return e&&(g=c.start=+g||+d||0,c.unit=f,c.end=e[1]?g+(e[1]+1)*e[2]:+e[2]),c}]};function fc(){return setTimeout(function(){$b=void 0}),$b=m.now()}function gc(a,b){var c,d={height:a},e=0;for(b=b?1:0;4>e;e+=2-b)c=T[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d.width=a),d}function hc(a,b,c){for(var d,e=(ec[b]||[]).concat(ec["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function ic(a,b,c){var d,e,f,g,h,i,j,l,n=this,o={},p=a.style,q=a.nodeType&&U(a),r=m._data(a,"fxshow");c.queue||(h=m._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,n.always(function(){n.always(function(){h.unqueued--,m.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[p.overflow,p.overflowX,p.overflowY],j=m.css(a,"display"),l="none"===j?m._data(a,"olddisplay")||Fb(a.nodeName):j,"inline"===l&&"none"===m.css(a,"float")&&(k.inlineBlockNeedsLayout&&"inline"!==Fb(a.nodeName)?p.zoom=1:p.display="inline-block")),c.overflow&&(p.overflow="hidden",k.shrinkWrapBlocks()||n.always(function(){p.overflow=c.overflow[0],p.overflowX=c.overflow[1],p.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],ac.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(q?"hide":"show")){if("show"!==e||!r||void 0===r[d])continue;q=!0}o[d]=r&&r[d]||m.style(a,d)}else j=void 0;if(m.isEmptyObject(o))"inline"===("none"===j?Fb(a.nodeName):j)&&(p.display=j);else{r?"hidden"in r&&(q=r.hidden):r=m._data(a,"fxshow",{}),f&&(r.hidden=!q),q?m(a).show():n.done(function(){m(a).hide()}),n.done(function(){var b;m._removeData(a,"fxshow");for(b in o)m.style(a,b,o[b])});for(d in o)g=hc(q?r[d]:0,d,n),d in r||(r[d]=g.start,q&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function jc(a,b){var c,d,e,f,g;for(c in a)if(d=m.camelCase(c),e=b[d],f=a[c],m.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=m.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function kc(a,b,c){var d,e,f=0,g=dc.length,h=m.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=$b||fc(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:m.extend({},b),opts:m.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:$b||fc(),duration:c.duration,tweens:[],createTween:function(b,c){var d=m.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;for(jc(k,j.opts.specialEasing);g>f;f++)if(d=dc[f].call(j,a,k,j.opts))return d;return m.map(k,hc,j),m.isFunction(j.opts.start)&&j.opts.start.call(a,j),m.fx.timer(m.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}m.Animation=m.extend(kc,{tweener:function(a,b){m.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");for(var c,d=0,e=a.length;e>d;d++)c=a[d],ec[c]=ec[c]||[],ec[c].unshift(b)},prefilter:function(a,b){b?dc.unshift(a):dc.push(a)}}),m.speed=function(a,b,c){var d=a&&"object"==typeof a?m.extend({},a):{complete:c||!c&&b||m.isFunction(a)&&a,duration:a,easing:c&&b||b&&!m.isFunction(b)&&b};return d.duration=m.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in m.fx.speeds?m.fx.speeds[d.duration]:m.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){m.isFunction(d.old)&&d.old.call(this),d.queue&&m.dequeue(this,d.queue)},d},m.fn.extend({fadeTo:function(a,b,c,d){return this.filter(U).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=m.isEmptyObject(a),f=m.speed(b,c,d),g=function(){var b=kc(this,m.extend({},a),f);(e||m._data(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=m.timers,g=m._data(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&cc.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&m.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=m._data(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=m.timers,g=d?d.length:0;for(c.finish=!0,m.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),m.each(["toggle","show","hide"],function(a,b){var c=m.fn[b];m.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(gc(b,!0),a,d,e)}}),m.each({slideDown:gc("show"),slideUp:gc("hide"),slideToggle:gc("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){m.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),m.timers=[],m.fx.tick=function(){var a,b=m.timers,c=0;for($b=m.now();c<b.length;c++)a=b[c],a()||b[c]!==a||b.splice(c--,1);b.length||m.fx.stop(),$b=void 0},m.fx.timer=function(a){m.timers.push(a),a()?m.fx.start():m.timers.pop()},m.fx.interval=13,m.fx.start=function(){_b||(_b=setInterval(m.fx.tick,m.fx.interval))},m.fx.stop=function(){clearInterval(_b),_b=null},m.fx.speeds={slow:600,fast:200,_default:400},m.fn.delay=function(a,b){return a=m.fx?m.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},function(){var a,b,c,d,e;b=y.createElement("div"),b.setAttribute("className","t"),b.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",d=b.getElementsByTagName("a")[0],c=y.createElement("select"),e=c.appendChild(y.createElement("option")),a=b.getElementsByTagName("input")[0],d.style.cssText="top:1px",k.getSetAttribute="t"!==b.className,k.style=/top/.test(d.getAttribute("style")),k.hrefNormalized="/a"===d.getAttribute("href"),k.checkOn=!!a.value,k.optSelected=e.selected,k.enctype=!!y.createElement("form").enctype,c.disabled=!0,k.optDisabled=!e.disabled,a=y.createElement("input"),a.setAttribute("value",""),k.input=""===a.getAttribute("value"),a.value="t",a.setAttribute("type","radio"),k.radioValue="t"===a.value}();var lc=/\r/g;m.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=m.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,m(this).val()):a,null==e?e="":"number"==typeof e?e+="":m.isArray(e)&&(e=m.map(e,function(a){return null==a?"":a+""})),b=m.valHooks[this.type]||m.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=m.valHooks[e.type]||m.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(lc,""):null==c?"":c)}}}),m.extend({valHooks:{option:{get:function(a){var b=m.find.attr(a,"value");return null!=b?b:m.trim(m.text(a))}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||(k.optDisabled?c.disabled:null!==c.getAttribute("disabled"))||c.parentNode.disabled&&m.nodeName(c.parentNode,"optgroup"))){if(b=m(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=m.makeArray(b),g=e.length;while(g--)if(d=e[g],m.inArray(m.valHooks.option.get(d),f)>=0)try{d.selected=c=!0}catch(h){d.scrollHeight}else d.selected=!1;return c||(a.selectedIndex=-1),e}}}}),m.each(["radio","checkbox"],function(){m.valHooks[this]={set:function(a,b){return m.isArray(b)?a.checked=m.inArray(m(a).val(),b)>=0:void 0}},k.checkOn||(m.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var mc,nc,oc=m.expr.attrHandle,pc=/^(?:checked|selected)$/i,qc=k.getSetAttribute,rc=k.input;m.fn.extend({attr:function(a,b){return V(this,m.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){m.removeAttr(this,a)})}}),m.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(a&&3!==f&&8!==f&&2!==f)return typeof a.getAttribute===K?m.prop(a,b,c):(1===f&&m.isXMLDoc(a)||(b=b.toLowerCase(),d=m.attrHooks[b]||(m.expr.match.bool.test(b)?nc:mc)),void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=m.find.attr(a,b),null==e?void 0:e):null!==c?d&&"set"in d&&void 0!==(e=d.set(a,c,b))?e:(a.setAttribute(b,c+""),c):void m.removeAttr(a,b))},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(E);if(f&&1===a.nodeType)while(c=f[e++])d=m.propFix[c]||c,m.expr.match.bool.test(c)?rc&&qc||!pc.test(c)?a[d]=!1:a[m.camelCase("default-"+c)]=a[d]=!1:m.attr(a,c,""),a.removeAttribute(qc?c:d)},attrHooks:{type:{set:function(a,b){if(!k.radioValue&&"radio"===b&&m.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}}}),nc={set:function(a,b,c){return b===!1?m.removeAttr(a,c):rc&&qc||!pc.test(c)?a.setAttribute(!qc&&m.propFix[c]||c,c):a[m.camelCase("default-"+c)]=a[c]=!0,c}},m.each(m.expr.match.bool.source.match(/\w+/g),function(a,b){var c=oc[b]||m.find.attr;oc[b]=rc&&qc||!pc.test(b)?function(a,b,d){var e,f;return d||(f=oc[b],oc[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,oc[b]=f),e}:function(a,b,c){return c?void 0:a[m.camelCase("default-"+b)]?b.toLowerCase():null}}),rc&&qc||(m.attrHooks.value={set:function(a,b,c){return m.nodeName(a,"input")?void(a.defaultValue=b):mc&&mc.set(a,b,c)}}),qc||(mc={set:function(a,b,c){var d=a.getAttributeNode(c);return d||a.setAttributeNode(d=a.ownerDocument.createAttribute(c)),d.value=b+="","value"===c||b===a.getAttribute(c)?b:void 0}},oc.id=oc.name=oc.coords=function(a,b,c){var d;return c?void 0:(d=a.getAttributeNode(b))&&""!==d.value?d.value:null},m.valHooks.button={get:function(a,b){var c=a.getAttributeNode(b);return c&&c.specified?c.value:void 0},set:mc.set},m.attrHooks.contenteditable={set:function(a,b,c){mc.set(a,""===b?!1:b,c)}},m.each(["width","height"],function(a,b){m.attrHooks[b]={set:function(a,c){return""===c?(a.setAttribute(b,"auto"),c):void 0}}})),k.style||(m.attrHooks.style={get:function(a){return a.style.cssText||void 0},set:function(a,b){return a.style.cssText=b+""}});var sc=/^(?:input|select|textarea|button|object)$/i,tc=/^(?:a|area)$/i;m.fn.extend({prop:function(a,b){return V(this,m.prop,a,b,arguments.length>1)},removeProp:function(a){return a=m.propFix[a]||a,this.each(function(){try{this[a]=void 0,delete this[a]}catch(b){}})}}),m.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(a,b,c){var d,e,f,g=a.nodeType;if(a&&3!==g&&8!==g&&2!==g)return f=1!==g||!m.isXMLDoc(a),f&&(b=m.propFix[b]||b,e=m.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=m.find.attr(a,"tabindex");return b?parseInt(b,10):sc.test(a.nodeName)||tc.test(a.nodeName)&&a.href?0:-1}}}}),k.hrefNormalized||m.each(["href","src"],function(a,b){m.propHooks[b]={get:function(a){return a.getAttribute(b,4)}}}),k.optSelected||(m.propHooks.selected={get:function(a){var b=a.parentNode;return b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex),null}}),m.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){m.propFix[this.toLowerCase()]=this}),k.enctype||(m.propFix.enctype="encoding");var uc=/[\t\r\n\f]/g;m.fn.extend({addClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j="string"==typeof a&&a;if(m.isFunction(a))return this.each(function(b){m(this).addClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(E)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(uc," "):" ")){f=0;while(e=b[f++])d.indexOf(" "+e+" ")<0&&(d+=e+" ");g=m.trim(d),c.className!==g&&(c.className=g)}return this},removeClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j=0===arguments.length||"string"==typeof a&&a;if(m.isFunction(a))return this.each(function(b){m(this).removeClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(E)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(uc," "):"")){f=0;while(e=b[f++])while(d.indexOf(" "+e+" ")>=0)d=d.replace(" "+e+" "," ");g=a?m.trim(d):"",c.className!==g&&(c.className=g)}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):this.each(m.isFunction(a)?function(c){m(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c){var b,d=0,e=m(this),f=a.match(E)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(c===K||"boolean"===c)&&(this.className&&m._data(this,"__className__",this.className),this.className=this.className||a===!1?"":m._data(this,"__className__")||"")})},hasClass:function(a){for(var b=" "+a+" ",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(" "+this[c].className+" ").replace(uc," ").indexOf(b)>=0)return!0;return!1}}),m.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){m.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),m.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}});var vc=m.now(),wc=/\?/,xc=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;m.parseJSON=function(b){if(a.JSON&&a.JSON.parse)return a.JSON.parse(b+"");var c,d=null,e=m.trim(b+"");return e&&!m.trim(e.replace(xc,function(a,b,e,f){return c&&b&&(d=0),0===d?a:(c=e||b,d+=!f-!e,"")}))?Function("return "+e)():m.error("Invalid JSON: "+b)},m.parseXML=function(b){var c,d;if(!b||"string"!=typeof b)return null;try{a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b))}catch(e){c=void 0}return c&&c.documentElement&&!c.getElementsByTagName("parsererror").length||m.error("Invalid XML: "+b),c};var yc,zc,Ac=/#.*$/,Bc=/([?&])_=[^&]*/,Cc=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Dc=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Ec=/^(?:GET|HEAD)$/,Fc=/^\/\//,Gc=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,Hc={},Ic={},Jc="*/".concat("*");try{zc=location.href}catch(Kc){zc=y.createElement("a"),zc.href="",zc=zc.href}yc=Gc.exec(zc.toLowerCase())||[];function Lc(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(E)||[];if(m.isFunction(c))while(d=f[e++])"+"===d.charAt(0)?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function Mc(a,b,c,d){var e={},f=a===Ic;function g(h){var i;return e[h]=!0,m.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function Nc(a,b){var c,d,e=m.ajaxSettings.flatOptions||{};for(d in b)void 0!==b[d]&&((e[d]?a:c||(c={}))[d]=b[d]);return c&&m.extend(!0,a,c),a}function Oc(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===e&&(e=a.mimeType||b.getResponseHeader("Content-Type"));if(e)for(g in h)if(h[g]&&h[g].test(e)){i.unshift(g);break}if(i[0]in c)f=i[0];else{for(g in c){if(!i[0]||a.converters[g+" "+i[0]]){f=g;break}d||(d=g)}f=f||d}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function Pc(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}m.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:zc,type:"GET",isLocal:Dc.test(yc[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Jc,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":m.parseJSON,"text xml":m.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Nc(Nc(a,m.ajaxSettings),b):Nc(m.ajaxSettings,a)},ajaxPrefilter:Lc(Hc),ajaxTransport:Lc(Ic),ajax:function(a,b){"object"==typeof a&&(b=a,a=void 0),b=b||{};var c,d,e,f,g,h,i,j,k=m.ajaxSetup({},b),l=k.context||k,n=k.context&&(l.nodeType||l.jquery)?m(l):m.event,o=m.Deferred(),p=m.Callbacks("once memory"),q=k.statusCode||{},r={},s={},t=0,u="canceled",v={readyState:0,getResponseHeader:function(a){var b;if(2===t){if(!j){j={};while(b=Cc.exec(f))j[b[1].toLowerCase()]=b[2]}b=j[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===t?f:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return t||(a=s[c]=s[c]||a,r[a]=b),this},overrideMimeType:function(a){return t||(k.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>t)for(b in a)q[b]=[q[b],a[b]];else v.always(a[v.status]);return this},abort:function(a){var b=a||u;return i&&i.abort(b),x(0,b),this}};if(o.promise(v).complete=p.add,v.success=v.done,v.error=v.fail,k.url=((a||k.url||zc)+"").replace(Ac,"").replace(Fc,yc[1]+"//"),k.type=b.method||b.type||k.method||k.type,k.dataTypes=m.trim(k.dataType||"*").toLowerCase().match(E)||[""],null==k.crossDomain&&(c=Gc.exec(k.url.toLowerCase()),k.crossDomain=!(!c||c[1]===yc[1]&&c[2]===yc[2]&&(c[3]||("http:"===c[1]?"80":"443"))===(yc[3]||("http:"===yc[1]?"80":"443")))),k.data&&k.processData&&"string"!=typeof k.data&&(k.data=m.param(k.data,k.traditional)),Mc(Hc,k,b,v),2===t)return v;h=k.global,h&&0===m.active++&&m.event.trigger("ajaxStart"),k.type=k.type.toUpperCase(),k.hasContent=!Ec.test(k.type),e=k.url,k.hasContent||(k.data&&(e=k.url+=(wc.test(e)?"&":"?")+k.data,delete k.data),k.cache===!1&&(k.url=Bc.test(e)?e.replace(Bc,"$1_="+vc++):e+(wc.test(e)?"&":"?")+"_="+vc++)),k.ifModified&&(m.lastModified[e]&&v.setRequestHeader("If-Modified-Since",m.lastModified[e]),m.etag[e]&&v.setRequestHeader("If-None-Match",m.etag[e])),(k.data&&k.hasContent&&k.contentType!==!1||b.contentType)&&v.setRequestHeader("Content-Type",k.contentType),v.setRequestHeader("Accept",k.dataTypes[0]&&k.accepts[k.dataTypes[0]]?k.accepts[k.dataTypes[0]]+("*"!==k.dataTypes[0]?", "+Jc+"; q=0.01":""):k.accepts["*"]);for(d in k.headers)v.setRequestHeader(d,k.headers[d]);if(k.beforeSend&&(k.beforeSend.call(l,v,k)===!1||2===t))return v.abort();u="abort";for(d in{success:1,error:1,complete:1})v[d](k[d]);if(i=Mc(Ic,k,b,v)){v.readyState=1,h&&n.trigger("ajaxSend",[v,k]),k.async&&k.timeout>0&&(g=setTimeout(function(){v.abort("timeout")},k.timeout));try{t=1,i.send(r,x)}catch(w){if(!(2>t))throw w;x(-1,w)}}else x(-1,"No Transport");function x(a,b,c,d){var j,r,s,u,w,x=b;2!==t&&(t=2,g&&clearTimeout(g),i=void 0,f=d||"",v.readyState=a>0?4:0,j=a>=200&&300>a||304===a,c&&(u=Oc(k,v,c)),u=Pc(k,u,v,j),j?(k.ifModified&&(w=v.getResponseHeader("Last-Modified"),w&&(m.lastModified[e]=w),w=v.getResponseHeader("etag"),w&&(m.etag[e]=w)),204===a||"HEAD"===k.type?x="nocontent":304===a?x="notmodified":(x=u.state,r=u.data,s=u.error,j=!s)):(s=x,(a||!x)&&(x="error",0>a&&(a=0))),v.status=a,v.statusText=(b||x)+"",j?o.resolveWith(l,[r,x,v]):o.rejectWith(l,[v,x,s]),v.statusCode(q),q=void 0,h&&n.trigger(j?"ajaxSuccess":"ajaxError",[v,k,j?r:s]),p.fireWith(l,[v,x]),h&&(n.trigger("ajaxComplete",[v,k]),--m.active||m.event.trigger("ajaxStop")))}return v},getJSON:function(a,b,c){return m.get(a,b,c,"json")},getScript:function(a,b){return m.get(a,void 0,b,"script")}}),m.each(["get","post"],function(a,b){m[b]=function(a,c,d,e){return m.isFunction(c)&&(e=e||d,d=c,c=void 0),m.ajax({url:a,type:b,dataType:e,data:c,success:d})}}),m.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){m.fn[b]=function(a){return this.on(b,a)}}),m._evalUrl=function(a){return m.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},m.fn.extend({wrapAll:function(a){if(m.isFunction(a))return this.each(function(b){m(this).wrapAll(a.call(this,b))});if(this[0]){var b=m(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&1===a.firstChild.nodeType)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return this.each(m.isFunction(a)?function(b){m(this).wrapInner(a.call(this,b))}:function(){var b=m(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=m.isFunction(a);return this.each(function(c){m(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){m.nodeName(this,"body")||m(this).replaceWith(this.childNodes)}).end()}}),m.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0||!k.reliableHiddenOffsets()&&"none"===(a.style&&a.style.display||m.css(a,"display"))},m.expr.filters.visible=function(a){return!m.expr.filters.hidden(a)};var Qc=/%20/g,Rc=/\[\]$/,Sc=/\r?\n/g,Tc=/^(?:submit|button|image|reset|file)$/i,Uc=/^(?:input|select|textarea|keygen)/i;function Vc(a,b,c,d){var e;if(m.isArray(b))m.each(b,function(b,e){c||Rc.test(a)?d(a,e):Vc(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==m.type(b))d(a,b);else for(e in b)Vc(a+"["+e+"]",b[e],c,d)}m.param=function(a,b){var c,d=[],e=function(a,b){b=m.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=m.ajaxSettings&&m.ajaxSettings.traditional),m.isArray(a)||a.jquery&&!m.isPlainObject(a))m.each(a,function(){e(this.name,this.value)});else for(c in a)Vc(c,a[c],b,e);return d.join("&").replace(Qc,"+")},m.fn.extend({serialize:function(){return m.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=m.prop(this,"elements");return a?m.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!m(this).is(":disabled")&&Uc.test(this.nodeName)&&!Tc.test(a)&&(this.checked||!W.test(a))}).map(function(a,b){var c=m(this).val();return null==c?null:m.isArray(c)?m.map(c,function(a){return{name:b.name,value:a.replace(Sc,"\r\n")}}):{name:b.name,value:c.replace(Sc,"\r\n")}}).get()}}),m.ajaxSettings.xhr=void 0!==a.ActiveXObject?function(){return!this.isLocal&&/^(get|post|head|put|delete|options)$/i.test(this.type)&&Zc()||$c()}:Zc;var Wc=0,Xc={},Yc=m.ajaxSettings.xhr();a.ActiveXObject&&m(a).on("unload",function(){for(var a in Xc)Xc[a](void 0,!0)}),k.cors=!!Yc&&"withCredentials"in Yc,Yc=k.ajax=!!Yc,Yc&&m.ajaxTransport(function(a){if(!a.crossDomain||k.cors){var b;return{send:function(c,d){var e,f=a.xhr(),g=++Wc;if(f.open(a.type,a.url,a.async,a.username,a.password),a.xhrFields)for(e in a.xhrFields)f[e]=a.xhrFields[e];a.mimeType&&f.overrideMimeType&&f.overrideMimeType(a.mimeType),a.crossDomain||c["X-Requested-With"]||(c["X-Requested-With"]="XMLHttpRequest");for(e in c)void 0!==c[e]&&f.setRequestHeader(e,c[e]+"");f.send(a.hasContent&&a.data||null),b=function(c,e){var h,i,j;if(b&&(e||4===f.readyState))if(delete Xc[g],b=void 0,f.onreadystatechange=m.noop,e)4!==f.readyState&&f.abort();else{j={},h=f.status,"string"==typeof f.responseText&&(j.text=f.responseText);try{i=f.statusText}catch(k){i=""}h||!a.isLocal||a.crossDomain?1223===h&&(h=204):h=j.text?200:404}j&&d(h,i,j,f.getAllResponseHeaders())},a.async?4===f.readyState?setTimeout(b):f.onreadystatechange=Xc[g]=b:b()},abort:function(){b&&b(void 0,!0)}}}});function Zc(){try{return new a.XMLHttpRequest}catch(b){}}function $c(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}m.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(a){return m.globalEval(a),a}}}),m.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),m.ajaxTransport("script",function(a){if(a.crossDomain){var b,c=y.head||m("head")[0]||y.documentElement;return{send:function(d,e){b=y.createElement("script"),b.async=!0,a.scriptCharset&&(b.charset=a.scriptCharset),b.src=a.url,b.onload=b.onreadystatechange=function(a,c){(c||!b.readyState||/loaded|complete/.test(b.readyState))&&(b.onload=b.onreadystatechange=null,b.parentNode&&b.parentNode.removeChild(b),b=null,c||e(200,"success"))},c.insertBefore(b,c.firstChild)},abort:function(){b&&b.onload(void 0,!0)}}}});var _c=[],ad=/(=)\?(?=&|$)|\?\?/;m.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=_c.pop()||m.expando+"_"+vc++;return this[a]=!0,a}}),m.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(ad.test(b.url)?"url":"string"==typeof b.data&&!(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&ad.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=m.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(ad,"$1"+e):b.jsonp!==!1&&(b.url+=(wc.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||m.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,_c.push(e)),g&&m.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),m.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||y;var d=u.exec(a),e=!c&&[];return d?[b.createElement(d[1])]:(d=m.buildFragment([a],b,e),e&&e.length&&m(e).remove(),m.merge([],d.childNodes))};var bd=m.fn.load;m.fn.load=function(a,b,c){if("string"!=typeof a&&bd)return bd.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>=0&&(d=m.trim(a.slice(h,a.length)),a=a.slice(0,h)),m.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(f="POST"),g.length>0&&m.ajax({url:a,type:f,dataType:"html",data:b}).done(function(a){e=arguments,g.html(d?m("<div>").append(m.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,e||[a.responseText,b,a])}),this},m.expr.filters.animated=function(a){return m.grep(m.timers,function(b){return a===b.elem}).length};var cd=a.document.documentElement;function dd(a){return m.isWindow(a)?a:9===a.nodeType?a.defaultView||a.parentWindow:!1}m.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=m.css(a,"position"),l=m(a),n={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=m.css(a,"top"),i=m.css(a,"left"),j=("absolute"===k||"fixed"===k)&&m.inArray("auto",[f,i])>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),m.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(n.top=b.top-h.top+g),null!=b.left&&(n.left=b.left-h.left+e),"using"in b?b.using.call(a,n):l.css(n)}},m.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){m.offset.setOffset(this,a,b)});var b,c,d={top:0,left:0},e=this[0],f=e&&e.ownerDocument;if(f)return b=f.documentElement,m.contains(b,e)?(typeof e.getBoundingClientRect!==K&&(d=e.getBoundingClientRect()),c=dd(f),{top:d.top+(c.pageYOffset||b.scrollTop)-(b.clientTop||0),left:d.left+(c.pageXOffset||b.scrollLeft)-(b.clientLeft||0)}):d},position:function(){if(this[0]){var a,b,c={top:0,left:0},d=this[0];return"fixed"===m.css(d,"position")?b=d.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),m.nodeName(a[0],"html")||(c=a.offset()),c.top+=m.css(a[0],"borderTopWidth",!0),c.left+=m.css(a[0],"borderLeftWidth",!0)),{top:b.top-c.top-m.css(d,"marginTop",!0),left:b.left-c.left-m.css(d,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||cd;while(a&&!m.nodeName(a,"html")&&"static"===m.css(a,"position"))a=a.offsetParent;return a||cd})}}),m.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c=/Y/.test(b);m.fn[a]=function(d){return V(this,function(a,d,e){var f=dd(a);return void 0===e?f?b in f?f[b]:f.document.documentElement[d]:a[d]:void(f?f.scrollTo(c?m(f).scrollLeft():e,c?e:m(f).scrollTop()):a[d]=e)},a,d,arguments.length,null)}}),m.each(["top","left"],function(a,b){m.cssHooks[b]=Lb(k.pixelPosition,function(a,c){return c?(c=Jb(a,b),Hb.test(c)?m(a).position()[b]+"px":c):void 0})}),m.each({Height:"height",Width:"width"},function(a,b){m.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){m.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return V(this,function(b,c,d){var e;return m.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?m.css(b,c,g):m.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),m.fn.size=function(){return this.length},m.fn.andSelf=m.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return m});var ed=a.jQuery,fd=a.$;return m.noConflict=function(b){return a.$===m&&(a.$=fd),b&&a.jQuery===m&&(a.jQuery=ed),m},typeof b===K&&(a.jQuery=a.$=m),m});
diff --git a/admportal/views/javascript_delete/sla.js b/admportal/views/javascript_delete/sla.js
deleted file mode 100644
index e3819a80..00000000
--- a/admportal/views/javascript_delete/sla.js
+++ /dev/null
@@ -1,11 +0,0 @@
-<script>
-function uploadDG(form)
-{
-	if ( form.filename.value.length == 0)
-	{
-		alert('Must select a file.');
-		return false;
-	}
-	else { form.submit(); return; }
-}
-</script>
diff --git a/admportal/views/logs/accesslog.ejs b/admportal/views/logs/accesslog.ejs
deleted file mode 100644
index 0b4ea56f..00000000
--- a/admportal/views/logs/accesslog.ejs
+++ /dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#access').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>HTTP Server Access Log</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-		if (result.code.length > 0) { 
-			if ( result.code == 'success' ) { %>
-				<div class='alert alert-success' role='alert'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } else { %> 
-				<div class='alert alert-danger' role='danger'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } %>
-		<% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-	<table id="access" class="table table-hover table-condensed">
-      <thead>
-        <tr>
-		  <th>Date (UTC)</th>
-          <th>Method</th>
-		  <th>Version</th>
-          <th>Status</th>
-          <th>URL</th>
-        </tr>
-      </thead>
-      <tbody>
-	  <% for(var x=0; x < rows.length; x++) { %>
-        <tr>
-            <td><%= rows[x].date %></td>
-            <td><%= rows[x].method %></td>
-            <td><%= rows[x].version %></td>
-            <td><%= rows[x].status %></td>
-            <td><%= rows[x].url %></td>
-        </tr>
-    <% } %>
-      </tbody>
-    </table>
-</div>
-
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-</body>
-</html>
-
diff --git a/admportal/views/logs/accesslog.ejs.0223 b/admportal/views/logs/accesslog.ejs.0223
deleted file mode 100644
index 77ece8f9..00000000
--- a/admportal/views/logs/accesslog.ejs.0223
+++ /dev/null
@@ -1,121 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#access').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>HTTP Server Access Log</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-		if (result.code.length > 0) { 
-			if ( result.code == 'success' ) { %>
-				<div class='alert alert-success' role='alert'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } else { %> 
-				<div class='alert alert-danger' role='danger'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } %>
-		<% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-	<table id="access" class="table table-hover table-condensed">
-      <thead>
-        <tr>
-		  <th>Date (UTC)</th>
-          <th>Method</th>
-		  <th>Version</th>
-          <th>Status</th>
-          <th>URL</th>
-        </tr>
-      </thead>
-      <tbody>
-	  <% for(var x=0; x<pageInfo.rows.length; x++) { %>
-        <tr>
-            <td><%= pageInfo.rows[x].date %></td>
-            <td><%= pageInfo.rows[x].method %></td>
-            <td><%= pageInfo.rows[x].version %></td>
-            <td><%= pageInfo.rows[x].status %></td>
-            <td><%= pageInfo.rows[x].url %></td>
-        </tr>
-    <% } %>
-      </tbody>
-    </table>
-</div>
-
-	<div class="container-fluid">
-    <div class="row">
-    <div class="col-md-1 text-left">
-        <p>&nbsp;&nbsp;Page <%= pageInfo.currentPage %> of <%= pageInfo.pageCount %></p>
-    </div>
-    <div class="col-md-11 text-left">
-    <% if (pageInfo.pageCount > 1) { %>
-        <ul class="pagination">
-        <% if (pageInfo.currentPage > 1) { %>
-            <li><a href="/logs/pageAccessLog?page=1">&laquo;</a></li>
-        <% } %>
-        <% var i = 1;
-        if (pageInfo.currentPage > 10) {
-            i = +pageInfo.currentPage - 9;
-        } %>
-        <% if (i !== 1) { %>
-            <!--<li class="disabled"><a href="#">...</a></li>-->
-        <% } %>
-        <% for (i; i<=pageInfo.pageCount; i++) { %>
-            <% if (pageInfo.currentPage == i) { %>
-                <li class="active"><span><%= i %> <span class="sr-only">(current)</span></span></li>
-            <% } else { %>
-                <li><a href="/logs/pageAccessLog?page=<%= i %>"><%= i %></a></li>
-            <% } %>
-            <% if (i == (+pageInfo.currentPage + 9)) { %>
-                <!--<li class="disabled"><a href="#">...</a></li>-->
-            <% break; } %>
-        <% } %>
-        <% if (pageInfo.currentPage != pageInfo.pageCount) { %>
-            <li><a href="/logs/pageAccessLog?page=<%= pageInfo.pageCount %>">&raquo;</a></li>
-        <% } %>
-        </ul>
-    <% } %>
-    </div><!-- col-md-10 -->
-    </div><!-- row -->
-    </div><!-- container-fluid -->
-
-
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-</body>
-</html>
-
diff --git a/admportal/views/logs/usertrace.ejs b/admportal/views/logs/usertrace.ejs
deleted file mode 100644
index cca003b0..00000000
--- a/admportal/views/logs/usertrace.ejs
+++ /dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#usertrace').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>User Trace</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-		if (result.code.length > 0) { 
-			if ( result.code == 'success' ) { %>
-				<div class='alert alert-success' role='alert'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } else { %> 
-				<div class='alert alert-danger' role='danger'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } %>
-		<% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-	<div class="table-responsive">
-	<table id="usertrace" class="table table-hover table-condensed">
-      <thead>
-        <tr>
-		  <th>Date (UTC)</th>
-          <th>ATTUID</th>
-		  <th>Action</th>
-          <th>Description</th>
-        </tr>
-      </thead>
-      <tbody id="myTable">
-      <% for (var x=0; x < rows.length; x++) { %>
-        <tr>
-            <td><%= rows[x].date %></td>
-            <td><%= rows[x].attuid %></td>
-            <td><%= rows[x].action %></td>
-            <td><%= rows[x].desc %></td>
-        </tr>
-	  <% } %>
-      </tbody>
-    </table>
-	</div>
-</div>
-		
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-</body>
-</html>
-
diff --git a/admportal/views/logs/usertrace.ejs.0223 b/admportal/views/logs/usertrace.ejs.0223
deleted file mode 100644
index 8a099edd..00000000
--- a/admportal/views/logs/usertrace.ejs.0223
+++ /dev/null
@@ -1,122 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#usertrace').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>User Trace</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-		if (result.code.length > 0) { 
-			if ( result.code == 'success' ) { %>
-				<div class='alert alert-success' role='alert'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } else { %> 
-				<div class='alert alert-danger' role='danger'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } %>
-		<% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-	<div class="table-responsive">
-	<table id="usertrace" class="table table-hover table-condensed">
-      <thead>
-        <tr>
-		  <th>Date (UTC)</th>
-          <th>ATTUID</th>
-		  <th>Action</th>
-          <th>Description</th>
-        </tr>
-      </thead>
-      <tbody id="myTable">
-      <% for (var x=0; x<pageInfo.rows.length; x++) { %>
-        <tr>
-            <td><%= pageInfo.rows[x].date %></td>
-            <td><%= pageInfo.rows[x].attuid %></td>
-            <td><%= pageInfo.rows[x].action %></td>
-            <td><%= pageInfo.rows[x].desc %></td>
-        </tr>
-	  <% } %>
-      </tbody>
-    </table>
-	</div>
-</div>
-		
-	
-
-	<div class="container-fluid">
-	<div class="row">
-	<div class="col-md-1 text-left">
-       	<p>&nbsp;&nbsp;Page <%= pageInfo.currentPage %> of <%= pageInfo.pageCount %></p>
-	</div>
-	<div class="col-md-11 text-left">
-	<% if (pageInfo.pageCount > 1) { %>  
-		<ul class="pagination">  
-  		<% if (pageInfo.currentPage > 1) { %>
-      		<li><a href="/logs/pageUserTrace?page=1">&laquo;</a></li>
-  		<% } %>
-  		<% var i = 1;
-  		if (pageInfo.currentPage > 10) {
-  			i = +pageInfo.currentPage - 9;
-  		} %>
-  		<% if (i !== 1) { %>
-      		<!--<li class="disabled"><a href="#">...</a></li>-->
-  		<% } %>
-  		<% for (i; i<=pageInfo.pageCount; i++) { %>
-    		<% if (pageInfo.currentPage == i) { %>
-        		<li class="active"><span><%= i %> <span class="sr-only">(current)</span></span></li>
-    		<% } else { %>
-        		<li><a href="/logs/pageUserTrace?page=<%= i %>"><%= i %></a></li>
-    		<% } %>
-    		<% if (i == (+pageInfo.currentPage + 9)) { %>
-        		<!--<li class="disabled"><a href="#">...</a></li>-->
-    		<% break; } %>
-  		<% } %>
-  		<% if (pageInfo.currentPage != pageInfo.pageCount) { %>
-      		<li><a href="/logs/pageUserTrace?page=<%= pageInfo.pageCount %>">&raquo;</a></li>
-  		<% } %>
-		</ul>  
-	<% } %>  
-	</div><!-- col-md-10 -->
-	</div><!-- row -->
-	</div><!-- container-fluid -->
-
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-</body>
-</html>
-
diff --git a/admportal/views/mobility/displayVnfData.ejs b/admportal/views/mobility/displayVnfData.ejs
deleted file mode 100644
index 596feb66..00000000
--- a/admportal/views/mobility/displayVnfData.ejs
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <title>SDN-C AdminPortal</title>
-  <meta charset="UTF-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-</head>
-<body>
-
-
-<div class="actions" style="padding:0px 25px;">
-<h2>VNF Data</h2>
-</div>
-
-<div class="container-fluid">
-<% if ( typeof result != 'undefined' ) {
-        if (result.code.length > 0) {
-            if ( result.code == 'success' ) { %>
-                <pre class='alert alert-success' role='alert'><%=JSON.stringify(result.msg,null,4) %></pre>
-            <% } else { %>
-                <pre class='alert alert-danger' role='danger'><%=result.msg %></pre>
-            <% } %>
-        <% } %>
-<% } %>
-</div>
-
-
-<footer>
-	 <% include ../partials/footer %>
-</footer>
-    
-</body>
-</html>
-
diff --git a/admportal/views/mobility/displayVnfNetworkData.ejs b/admportal/views/mobility/displayVnfNetworkData.ejs
deleted file mode 100644
index e2bcd637..00000000
--- a/admportal/views/mobility/displayVnfNetworkData.ejs
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <title>SDN-C AdminPortal</title>
-  <meta charset="UTF-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-</head>
-<body>
-
-
-<div class="actions" style="padding:0px 25px;">
-<h2>VNF Network Data</h2>
-</div>
-
-<div class="container-fluid">
-<% if ( typeof result != 'undefined' ) {
-        if (result.code.length > 0) {
-            if ( result.code == 'success' ) { %>
-                <pre class='alert alert-success' role='alert'><%=JSON.stringify(result.msg,null,4) %></pre>
-            <% } else { %>
-                <pre class='alert alert-danger' role='danger'><%=result.msg %></pre>
-            <% } %>
-        <% } %>
-<% } %>
-</div>
-
-
-<footer>
-	 <% include ../partials/footer %>
-</footer>
-    
-</body>
-</html>
-
diff --git a/admportal/views/mobility/vmNetworks.ejs b/admportal/views/mobility/vmNetworks.ejs
deleted file mode 100644
index 6394c44d..00000000
--- a/admportal/views/mobility/vmNetworks.ejs
+++ /dev/null
@@ -1,198 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#vm_networks').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>VM Networks </h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-		if (result.code.length > 0) { 
-			if ( result.code == 'success' ) { %>
-				<div class='alert alert-success' role='alert'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } else { %> 
-				<div class='alert alert-danger' role='danger'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } %>
-		<% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-
-	<% if (priv == 'A'){ %>
-	<div class="actions" style="padding:15px 0px;">
-    <button class="btn btn-primary btn-md" data-toggle="modal" data-target="#add_vm_network">
-      Add VM Network
-    </button>
-	</div>
-	<% } %>
-
-	<table id="vm_networks" class="table table-hover table-condensed">
-      <thead>
-        <tr>
-		  <th>*VNF_TYPE</th>
-		  <th>*VM_TYPE</th>
-          <th>*NETWORK_ROLE</th>
-          <th>IP_COUNT</th>
-          <th>ASSIGN_IPS</th>
-          <th>ASSIGN_MACS</th>
-          <th>ASSIGN_FLOATING_IP</th>
-		  <% if(priv == 'A'){ %>
-          <th>Action</th>
-          <% } %>
-        </tr>
-      </thead>
-      <tbody>
-		<% rows.forEach( function(row) { %>
-        <tr>
-            <td><%= row.vnf_type %></td>
-            <td><%= row.vm_type %></td>
-            <td><%= row.network_role %></td>
-			<td><%= row.ip_count %></td>
-            <td><%= (row.assign_ips == '1') ? 'true' : 'false' %></td>
-            <td><%= (row.assign_macs == '1') ? 'true' : 'false' %></td>
-            <td><%= (row.assign_floating_ip == '1') ? 'true' : 'false' %></td>
-			<% if(priv == 'A' ) { %>
-            <td>
-				<button type="button" class="btn btn-default btn-xs"
-                   onclick="deleteVmNetwork('<%= row.vnf_type %>', '<%= row.vm_type %>', '<%= row.network_role %>');">Delete</button>
-            </td>
-            <% } %>
-        </tr>
-		<% }); %>
-      </tbody>
-    </table>
-
-	<% if(priv == 'A'){ %>
-	<div class="actions" style="padding:0px 25px;">
-	<form method="POST" action="/mobility/uploadVmNetworks" enctype="multipart/form-data">
-		<div class="form-group">
-    		<label for="dest">File input</label>
-    		<input name="filename" type="file" id="dest">
-    		<p class="help-block">Choose a file to upload.</p>
-  		</div>
-        <button type="button" class="btn btn-default"
-                onclick="uploadFile(this.form);">Upload File</button>
-	</form>
-	</div>
-	<% } %>
-</div>
-
-<% include ../partials/vm_networks %>
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-<script type="text/javascript">
-
-function addVmNetwork(form)
-{
-	var errorMsg='';
-	var vnf_type='';
-	var vm_type='';
-	var network_role='';
-	var ip_count = '';
-	var assign_ips='';
-	var assign_macs='';
-	var assign_floating_ip='';
-
-	if ( form.name == 'addForm' )
-	{
-		vnf_type = form.nf_vnf_type;
-		vm_type = form.nf_vm_type;
-		network_role = form.nf_network_role;
-		ip_count = form.nf_ip_count;
-		assign_ips = form.nf_assign_ips;
-		assign_macs = form.nf_assign_macs;
-		assign_floating_ip = form.nf_assign_floating_ip;
-	}
-
-	if ( (vnf_type.value == null) || (vnf_type.value == "") || isblank(vnf_type.value) )
-	{
-		errorMsg += 'VNF Type is required.<br>';
-	}
-	if ( (vm_type.value == null) || (vm_type.value == "") || isblank(vm_type.value) )
-	{
-		errorMsg += 'VM Type is required.<br>';
-	}
-	if ( (network_role.value == null) || (network_role.value == "") || isblank(network_role.value) ){
-		errorMsg += 'Network Role is required.<br>';
-	}
-	if( errorMsg.length > 0 ) {
-		bootbox.alert(errorMsg);
-		return;
-	}
-	if (ip_count.value.length >0 && !isDigit(ip_count.value) )
-    {
-        bootbox.alert('VM Count must be a number.');
-        return;
-    }
-	if (assign_ips.value == 'true' && ip_count.value.length == 0)
-    {
-        bootbox.alert("If ASSIGN IPS equals 'true', IP COUNT must be populated with a number.");
-        return;
-    }
-
-	form.submit();
-}
-
-function deleteVmNetwork(vnf_type,vm_type,network_role) {
-
-    bootbox.confirm({
-        message: "Are you sure you want to delete VM_NETWORK [" + vnf_type + "]" + "[" + vm_type + "][" + network_role + "]",
-        callback: function(result) {
-            if ( result )
-            {
-				location.assign("/mobility/deleteVmNetwork?vnf_type=" + vnf_type + "&vm_type=" + vm_type + "&network_role=" + network_role);
-
-            }
-            return;
-        },
-        buttons: {
-            cancel: {
-                label: "Cancel"
-            },
-            confirm: {
-                label: "Yes"
-            }
-        }
-    });
-}
-
-</script>
-
-</body>
-</html>
-
diff --git a/admportal/views/mobility/vmProfile.ejs b/admportal/views/mobility/vmProfile.ejs
deleted file mode 100644
index f702e51a..00000000
--- a/admportal/views/mobility/vmProfile.ejs
+++ /dev/null
@@ -1,173 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#vm_profile').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>VM Profile </h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-		if (result.code.length > 0) { 
-			if ( result.code == 'success' ) { %>
-				<div class='alert alert-success' role='alert'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } else { %> 
-				<div class='alert alert-danger' role='danger'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } %>
-		<% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-
-	<% if (priv == 'A'){ %>
-	<div class="actions" style="padding:15px 0px;">
-    <button class="btn btn-primary btn-md" data-toggle="modal" data-target="#add_vm_profile">
-      Add VM Profile
-    </button>
-	</div>
-	<% } %>
-
-	<table id="vm_profile" class="table table-hover table-condensed">
-      <thead>
-        <tr>
-		  <th>*VNF_TYPE</th>
-		  <th>*VM_TYPE</th>
-		  <th>VM_COUNT</th>
-		  <% if(priv == 'A'){ %>
-          <th>Action</th>
-          <% } %>
-        </tr>
-      </thead>
-      <tbody>
-		<% rows.forEach( function(row) { %>
-        <tr>
-            <td><%= row.vnf_type %></td>
-            <td><%= row.vm_type %></td>
-            <td><%= row.vm_count %></td>
-			<% if(priv == 'A' ) { %>
-            <td>
-				<button type="button" class="btn btn-default btn-xs"
-                   onclick="deleteVmProfile('<%= row.vnf_type %>', '<%= row.vm_type %>');">Delete</button>
-            </td>
-            <% } %>
-        </tr>
-		<% }); %>
-      </tbody>
-    </table>
-
-	<% if(priv == 'A'){ %>
-	<div class="actions" style="padding:0px 25px;">
-	<form method="POST" action="/mobility/uploadVmProfile" enctype="multipart/form-data">
-		<div class="form-group">
-    		<label for="dest">File input</label>
-    		<input name="filename" type="file" id="dest">
-    		<p class="help-block">Choose a file to upload.</p>
-  		</div>
-        <button type="button" class="btn btn-default"
-                onclick="uploadFile(this.form);">Upload File</button>
-	</form>
-	</div>
-	<% } %>
-</div>
-
-<% include ../partials/vm_profile %>
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-<script type="text/javascript">
-
-function addVmProfile(form)
-{
-	var errorMsg='';
-	var vnf_type='';
-	var vm_type='';
-	var vm_count='';
-
-	if ( form.name == 'addForm' )
-	{
-		vnf_type = form.nf_vnf_type;
-		vm_type = form.nf_vm_type;
-		vm_count = form.nf_vm_count;
-	}
-
-	if ( (vnf_type.value == null) || (vnf_type.value == "") || isblank(vnf_type.value) )
-	{
-		errorMsg += 'VNF Type is required.<br>';
-	}
-	if ( (vm_type.value == null) || (vm_type.value == "") || isblank(vm_type.value) )
-	{
-		errorMsg += 'VM Type is required.<br>';
-	}
-	if( errorMsg.length > 0 ) {
-		bootbox.alert(errorMsg);
-		return;
-	}
-
-	if ( vm_count.value.length > 0 && !isDigit(vm_count.value) )
-	{
-		bootbox.alert('VM Count must be a number.');
-		return;
-	}
-	form.submit();
-}
-
-function deleteVmProfile(vnf_type, vm_type) {
-
-    bootbox.confirm({
-        message: "Are you sure you want to delete VM_PROFILE [" + vnf_type + "][" + vm_type + "]",
-        callback: function(result) {
-            if ( result )
-            {
-				location.assign("/mobility/deleteVmProfile?vnf_type=" + vnf_type + "&vm_type=" + vm_type);
-            }
-            return;
-        },
-        buttons: {
-            cancel: {
-                label: "Cancel"
-            },
-            confirm: {
-                label: "Yes"
-            }
-        }
-    });
-}
-
-</script>
-
-</body>
-</html>
-
diff --git a/admportal/views/mobility/vnfNetworks.ejs b/admportal/views/mobility/vnfNetworks.ejs
deleted file mode 100644
index a4a9f170..00000000
--- a/admportal/views/mobility/vnfNetworks.ejs
+++ /dev/null
@@ -1,163 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#vnf_networks').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>VNF Networks </h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-		if (result.code.length > 0) { 
-			if ( result.code == 'success' ) { %>
-				<div class='alert alert-success' role='alert'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } else { %> 
-				<div class='alert alert-danger' role='danger'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } %>
-		<% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-
-	<% if (priv == 'A'){ %>
-	<div class="actions" style="padding:15px 0px;">
-    <button class="btn btn-primary btn-md" data-toggle="modal" data-target="#add_vnf_network">
-      Add VNF Network
-    </button>
-	</div>
-	<% } %>
-
-	<table id="vnf_networks" class="table table-hover table-condensed">
-      <thead>
-        <tr>
-		  <th>*VNF_TYPE</th>
-		  <th>*NETWORK_ROLE</th>
-		  <% if(priv == 'A'){ %>
-          <th>Action</th>
-          <% } %>
-        </tr>
-      </thead>
-      <tbody>
-		<% rows.forEach( function(row) { %>
-        <tr>
-            <td><%= row.vnf_type %></td>
-            <td><%= row.network_role %></td>
-			<% if(priv == 'A' ) { %>
-            <td>
-				<button type="button" class="btn btn-default btn-xs"
-                   onclick="deleteVnfNetwork('<%= row.vnf_type %>', '<%= row.network_role %>');">Delete</button>
-            </td>
-            <% } %>
-        </tr>
-		<% }); %>
-      </tbody>
-    </table>
-
-	<% if(priv == 'A'){ %>
-	<div class="actions" style="padding:0px 25px;">
-	<form method="POST" action="/mobility/uploadVnfNetworks" enctype="multipart/form-data">
-		<div class="form-group">
-    		<label for="dest">File input</label>
-    		<input name="filename" type="file" id="dest">
-    		<p class="help-block">Choose a file to upload.</p>
-  		</div>
-        <button type="button" class="btn btn-default"
-                onclick="uploadFile(this.form);">Upload File</button>
-	</form>
-	</div>
-	<% } %>
-</div>
-
-<% include ../partials/vnf_network %>
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-<script type="text/javascript">
-
-function addVnfNetwork(form)
-{
-	var errorMsg='';
-	var vnf_type='';
-	var network_role='';
-
-	if ( form.name == 'addForm' )
-	{
-		vnf_type = form.nf_vnf_type;
-		network_role = form.nf_network_role;
-	}
-
-	if ( (vnf_type.value == null) || (vnf_type.value == "") || isblank(vnf_type.value) )
-	{
-		errorMsg += 'VNF Type is required.<br>';
-	}
-	if ( (network_role.value == null) || (network_role.value == "") || isblank(network_role.value) )
-	{
-		errorMsg += 'Network Role is required.<br>';
-	}
-	if( errorMsg.length > 0 ) {
-		bootbox.alert(errorMsg);
-		return;
-	}
-	form.submit();
-}
-
-function deleteVnfNetwork(vnf_type, network_role) {
-
-    bootbox.confirm({
-        message: "Are you sure you want to delete VNF_NETWORK [" + vnf_type + "][" + network_role + "]",
-        callback: function(result) {
-            if ( result )
-            {
-				location.assign("/mobility/deleteVnfNetwork?vnf_type=" + vnf_type + "&network_role=" + network_role);
-            }
-            return;
-        },
-        buttons: {
-            cancel: {
-                label: "Cancel"
-            },
-            confirm: {
-                label: "Yes"
-            }
-        }
-    });
-}
-
-</script>
-
-</body>
-</html>
-
diff --git a/admportal/views/mobility/vnfPreloadData.ejs b/admportal/views/mobility/vnfPreloadData.ejs
deleted file mode 100644
index 4dc73987..00000000
--- a/admportal/views/mobility/vnfPreloadData.ejs
+++ /dev/null
@@ -1,246 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#vnf_data').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>Pre-load VNF Data</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-		if (result.code.length > 0) { 
-			if ( result.code == 'success' ) { %>
-				<div class='alert alert-success' role='alert'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } else { %> 
-				<div class='alert alert-danger' role='danger'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } %>
-		<% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-
-	<table id="vnf_data" class="table table-hover table-condensed">
-      <thead>
-        <tr>
-		  <th>ID</th>
-		  <th>SVC_REQUEST_ID</th>
-		  <th>VNF_NAME</th>
-		  <th>VNF_TYPE</th>
-		  <th>SVC_ACTION</th>
-		  <th>UPLOAD STATUS</th>
-          <th>FILENAME</th>
-          <th>IMPORT/UPLOAD TIMESTAMP</th>
-		  <% if(priv == 'A'){ %>
-          <th>Action</th>
-          <% } %>
-        </tr>
-      </thead>
-      <tbody>
-		<% var i=0; retData.forEach( function(rowObj) { %>
-        <tr>
-            <td><%= rowObj.row.id %></td>
-            <td><a href="javascript:getVnfData('<%= rowObj.vnf_name %>','<%= rowObj.vnf_type %>');"><%= rowObj.row.svc_request_id %></a></td>
-			<td><%= rowObj.vnf_name %></td>
-			<td><%= rowObj.vnf_type %></td>
-            <td><%= rowObj.row.svc_action %></td>
-            <td><%= rowObj.row.status %></td>
-			<td>
-                <a data-toggle="collapse"
-                    href="#collapseExample<%= i %>" aria-expanded="false"
-                    aria-controls="collapseExample"><%= rowObj.row.filename %>
-                </a>
-                <div class="collapse" id="collapseExample<%= i %>">
-                    <div class="well">
-                        <pre><%= JSON.stringify(rowObj.filecontent,null,4) %></pre>
-                    </div>
-                </div>
-           </td>
-
-            <td><%= rowObj.row.ts %></td>
-			<% if(priv == 'A' ) { %>
-            <td>
-				<button type="button" class="btn btn-default btn-xs"
-                onclick="deleteVnfData('<%= rowObj.row.id %>','<%= rowObj.row.svc_request_id %>','<%= rowObj.row.filename %>','<%= rowObj.row.status %>','<%= rowObj.vnf_name %>','<%= rowObj.vnf_type %>');">Delete</button>
-            <% if (typeof rowObj.vnf_name != 'undefined' || typeof rowObj.vnf_type != 'undefined'){ %>
-				<button type="button" class="btn btn-default btn-xs"
-                onclick="loadVnfData('<%= rowObj.row.id %>','<%= rowObj.row.svc_request_id %>','<%= rowObj.row.svc_action %>','<%= rowObj.row.status %>','<%= rowObj.row.filename %>','<%= rowObj.row.ts %>');">Load Data</button>
-            <% } %>
-            </td>
-            <% } %>
-        </tr>
-		<% i++; }); %>
-      </tbody>
-    </table>
-
-	<% if(priv == 'A'){ %>
-	<div class="row">
-    <div class="col-md-8  col-md-push-4">
-	<form method="POST" action="/mobility/uploadVnfData" enctype="multipart/form-data">
-		<div class="form-group">
-				<input type="hidden" name="_csrf" value="<%= privilege.csrfToken %>" />
-    		<label for="dest">Upload pre processed JSON file.</label>
-    		<input name="filename" type="file" id="dest" />
-    		<p class="help-block">Choose a JSON file to upload.</p>
-            <button type="button" class="btn btn-default"
-				data-toggle="tooltip" data-placement="bottom"
-				title="Upload a JSON file that has already been pre processed."
-                onclick="uploadFile(this.form);">Upload JSON File</button>
-  		</div>
-	</form>
-    </div>
-	<div class="col-md-4 col-md-pull-8">
-	<form method="POST" action="/preload/uploadVnfCsv" enctype="multipart/form-data">
-		<div class="form-group">
-				<input type="hidden" name="_csrf" value="<%= privilege.csrfToken %>" />
-    		<label for="dest">Upload Worksheet CSV files from the <%= preloadImportDirectory %> directory.</label>
-    		<input name="filename" type="file" id="dest" multiple />
-    		<p class="help-block">Choose Worksheet CSV files to upload.</p>
-			<button type="button" class="btn btn-default" 
-				data-toggle="tooltip" data-placement="bottom" 
-				title="Must upload all the VNF CSV files from <%= preloadImportDirectory %>"
-				onclick="importWorksheet(this.form);">Upload VNF Worksheet CSV files
-			</button>
-  		</div>
-	</form>
-	</div>
-	</div>
-	<% } %>
-</div>
-
-<% include ../partials/add_service_homing %>
-<% include ../partials/update_service_homing %>
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-<script type="text/javascript">
-
-function importWorksheet(form)
-{
-    if ( form.filename.value.length == 0)
-    {
-        bootbox.alert('Must select a file.');
-        return false;
-    }
-    else { 
-
-		bootbox.confirm({
-        	message: "Are you sure you want to import VNF WORKSHEET .csv files from <%= preloadImportDirectory %>",
-        	callback: function(result) {
-            	if ( result )
-            	{
-					form.submit();
-            	}
-            	return;
-        	},
-        	buttons: {
-            	cancel: {
-                	label: "Cancel"
-            	},
-            	confirm: {
-                	label: "Yes"
-            	}
-        	}
-    	});
-	}
-}
-
-
-function getVnfData(vnf_name,vnf_type,svc_request_id)
-{
-	location.assign("/mobility/viewVnfData?vnf_name=" + vnf_name + "&vnf_type=" + vnf_type );
-	return;
-}
-function loadVnfData(id,svc_request_id,svc_action,status,filename,ts)
-{
-	if ( status != 'pending' )
-	{
-		bootbox.alert("Upload Status must be in 'pending' state.");
-		return;
-	}
-	bootbox.confirm({
-        message: "Are you sure you want to load file [" + filename + "]? ",
-        callback: function(result) {
-            if ( result )
-            {
-				location.assign("/mobility/loadVnfData?id=" + id + "&svc_request_id=" + svc_request_id + "&filename=" + filename + "&status=" + status);
-            }
-            return;
-        },
-        buttons: {
-            cancel: {
-                label: "Cancel"
-            },
-            confirm: {
-                label: "Yes"
-            }
-        }
-    });
-}
-
-function deleteVnfData(id,svc_request_id,filename,status,vnf_name,vnf_type) {
-
-    bootbox.confirm({
-        message: "Are you sure you want to delete uploaded file [" + filename + "]? ",
-        callback: function(result) {
-            if ( result )
-            {
-				location.assign("/mobility/deleteVnfData?id=" 
-					+ id 
-					+ "&svc_request_id=" + svc_request_id 
-					+ "&filename=" + filename 
-					+ "&status=" + status
-					+ "&vnf_name=" + vnf_name
-					+ "&vnf_type=" + vnf_type);
-            }
-            return;
-        },
-        buttons: {
-            cancel: {
-                label: "Cancel"
-            },
-            confirm: {
-                label: "Yes"
-            }
-        }
-    });
-}
-
-</script>
-
-</body>
-</html>
-
diff --git a/admportal/views/mobility/vnfPreloadNetworkData.ejs b/admportal/views/mobility/vnfPreloadNetworkData.ejs
deleted file mode 100644
index 5d6204c0..00000000
--- a/admportal/views/mobility/vnfPreloadNetworkData.ejs
+++ /dev/null
@@ -1,242 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#preload_vnf_data').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>Pre-load VNF Network Data</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-		if (result.code.length > 0) { 
-			if ( result.code == 'success' ) { %>
-				<div class='alert alert-success' role='alert'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } else { %> 
-				<div class='alert alert-danger' role='danger'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } %>
-		<% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-
-	<table id="preload_vnf_data" class="table table-hover table-condensed">
-      <thead>
-        <tr>
-		  <th>ID</th>
-		  <th>SVC_REQUEST_ID</th>
-		  <th>NETWORK_NAME</th>
-		  <th>NETWORK_TYPE</th>
-		  <th>SVC_ACTION</th>
-		  <th>UPLOAD STATUS</th>
-          <th>FILENAME</th>
-          <th>IMPORT/UPLOAD TIMESTAMP</th>
-		  <% if(priv == 'A'){ %>
-          <th>Action</th>
-          <% } %>
-        </tr>
-      </thead>
-      <tbody>
-		<% var i=0; retData.forEach( function(rowObj) { %>
-        <tr>
-            <td><%= rowObj.row.id %></td>
-            <td><a href="javascript:getVnfNetworkData('<%= rowObj.network_name %>','<%= rowObj.network_type %>');"><%= rowObj.row.svc_request_id %></a></td>
-			<td><%= rowObj.network_name %></td>
-			<td><%= rowObj.network_type %></td>
-            <td><%= rowObj.row.svc_action %></td>
-            <td><%= rowObj.row.status %></td>
-			<td>
-                <a data-toggle="collapse"
-                    href="#collapseExample<%= i %>" aria-expanded="false"
-                    aria-controls="collapseExample"><%= rowObj.row.filename %>
-                </a>
-                <div class="collapse" id="collapseExample<%= i %>">
-                    <div class="well">
-                        <pre><%= JSON.stringify(rowObj.filecontent,null,4) %></pre>
-                    </div>
-                </div>
-           </td>
-
-            <td><%= rowObj.row.ts %></td>
-			<% if(priv == 'A' ) { %>
-            <td>
-				<button type="button" class="btn btn-default btn-xs"
-                onclick="deleteVnfNetworkData('<%= rowObj.row.id %>','<%= rowObj.row.svc_request_id %>','<%= rowObj.row.filename %>','<%= rowObj.row.status %>','<%= rowObj.network_name %>','<%= rowObj.network_type %>');">Delete</button>
-            <% if (typeof rowObj.network_name != 'undefined' || typeof rowObj.network_type != 'undefined'){ %>
-				<button type="button" class="btn btn-default btn-xs"
-                onclick="loadVnfNetworkData('<%= rowObj.row.id %>','<%= rowObj.row.svc_request_id %>','<%= rowObj.row.svc_action %>','<%= rowObj.row.status %>','<%= rowObj.row.filename %>','<%= rowObj.row.ts %>');">Load Data</button>
-            <% } %>
-			</td>
-            <% } %>
-        </tr>
-		<% i++; }); %>
-      </tbody>
-    </table>
-
-	<% if(priv == 'A'){ %>
-<div class="row">
-    <div class="col-md-8  col-md-push-4">
-    <form method="POST" action="/mobility/uploadVnfNetworkData" enctype="multipart/form-data">
-        <div class="form-group">
-            <label for="dest">Upload pre processed JSON file.</label>
-            <input name="filename" type="file" id="dest" />
-            <p class="help-block">Choose a JSON file to upload.</p>
-            <button type="button" class="btn btn-default"
-                data-toggle="tooltip" data-placement="bottom"
-                title="Upload a JSON file that has already been pre processed."
-                onclick="uploadFile(this.form);">Upload JSON File
-			</button>
-        </div>
-    </form>
-    </div>
-    <div class="col-md-4 col-md-pull-8">
-    <form method="POST" action="/preload/uploadNetworkCsv" enctype="multipart/form-data">
-        <div class="form-group">
-            <label for="dest">Upload Worksheet CSV files from the <%= preloadImportDirectory %> directory.</label>
-            <input name="filename" type="file" id="dest" multiple />
-            <p class="help-block">Choose Worksheet CSV files to upload.</p>
-            <button type="button" class="btn btn-default"
-                data-toggle="tooltip" data-placement="bottom"
-                title="Must upload all the VNF CSV files from <%= preloadImportDirectory %>"
-                onclick="importWorksheet(this.form);">Upload Network Worksheet CSV files
-            </button>
-        </div>
-    </form>
-    </div>
-</div>
-    <% } %>
-</div>
-
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-<script type="text/javascript">
-
-function importWorksheet(form)
-{
-    if ( form.filename.value.length == 0)
-    {
-        bootbox.alert('Must select a file.');
-        return false;
-    }
-    else {
-
-        bootbox.confirm({
-            message: "Are you sure you want to import Network WORKSHEET .csv files from <%= preloadImportDirectory %>",
-            callback: function(result) {
-                if ( result )
-                {
-                    form.submit();
-                }
-                return;
-            },
-            buttons: {
-                cancel: {
-                    label: "Cancel"
-                },
-                confirm: {
-                    label: "Yes"
-                }
-            }
-        });
-    }
-}
-
-function getVnfNetworkData(network_name,network_type)
-{
-	location.assign("/mobility/viewVnfNetworkData?network_name=" + network_name + "&network_type=" + network_type );
-	return;
-}
-function loadVnfNetworkData(id,svc_request_id,svc_action,status,filename,ts)
-{
-	if ( status != 'pending' )
-	{
-		bootbox.alert("Upload Status must be in 'pending' state.");
-		return;
-	}
-	bootbox.confirm({
-        message: "Are you sure you want to load file [" + filename + "]? ",
-        callback: function(result) {
-            if ( result )
-            {
-				location.assign("/mobility/loadVnfNetworkData?id=" + id + "&svc_request_id=" + svc_request_id + "&filename=" + filename + "&status=" + status);
-            }
-            return;
-        },
-        buttons: {
-            cancel: {
-                label: "Cancel"
-            },
-            confirm: {
-                label: "Yes"
-            }
-        }
-    });
-}
-
-function deleteVnfNetworkData(id,svc_request_id,filename,status,network_name,network_type) {
-
-    bootbox.confirm({
-        message: "Are you sure you want to delete uploaded file [" + filename + "]? ",
-        callback: function(result) {
-            if ( result )
-            {
-				location.assign("/mobility/deleteVnfNetworkData?id=" 
-					+ id 
-					+ "&svc_request_id=" + svc_request_id 
-					+ "&filename=" + filename 
-					+ "&status=" + status
-					+ "&network_name=" + network_name
-					+ "&network_type=" + network_type);
-            }
-            return;
-        },
-        buttons: {
-            cancel: {
-                label: "Cancel"
-            },
-            confirm: {
-                label: "Yes"
-            }
-        }
-    });
-}
-
-</script>
-
-</body>
-</html>
-
diff --git a/admportal/views/mobility/vnfProfile.ejs b/admportal/views/mobility/vnfProfile.ejs
deleted file mode 100644
index a801b90c..00000000
--- a/admportal/views/mobility/vnfProfile.ejs
+++ /dev/null
@@ -1,178 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#vnf_profile').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>VNF Profile </h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-		if (result.code.length > 0) { 
-			if ( result.code == 'success' ) { %>
-				<div class='alert alert-success' role='alert'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } else { %> 
-				<div class='alert alert-danger' role='danger'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } %>
-		<% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-
-	<% if (priv == 'A'){ %>
-	<div class="actions" style="padding:15px 0px;">
-    <button class="btn btn-primary btn-md" data-toggle="modal" data-target="#add_vnf_profile">
-      Add VNF Profile
-    </button>
-	</div>
-	<% } %>
-
-	<table id="vnf_profile" class="table table-hover table-condensed">
-      <thead>
-        <tr>
-		  <th>*VNF_TYPE</th>
-		  <th>AVAILABILITY_ZONE_COUNT</th>
-		  <th>EQUIPMENT_ROLE</th>
-		  <% if(priv == 'A'){ %>
-          <th>Action</th>
-          <% } %>
-        </tr>
-      </thead>
-      <tbody>
-		<% rows.forEach( function(row) { %>
-        <tr>
-            <td><%= row.vnf_type %></td>
-            <td><%= row.availability_zone_count %></td>
-            <td><%= row.equipment_role %></td>
-			<% if(priv == 'A' ) { %>
-            <td>
-				<button type="button" class="btn btn-default btn-xs"
-                   onclick="deleteVnfProfile('<%= row.vnf_type %>');">Delete</button>
-            </td>
-            <% } %>
-        </tr>
-		<% }); %>
-      </tbody>
-    </table>
-
-	<% if(priv == 'A'){ %>
-	<div class="actions" style="padding:0px 25px;">
-	<form method="POST" action="/mobility/uploadVnfProfile" enctype="multipart/form-data">
-		<input type="hidden" name="_csrf" value="<%= privilege.csrfToken %>" />
-		<div class="form-group">
-    		<label for="dest">File input</label>
-    		<input name="filename" type="file" id="dest">
-    		<p class="help-block">Choose a file to upload.</p>
-  		</div>
-        <button type="button" class="btn btn-default"
-                onclick="uploadFile(this.form);">Upload File</button>
-	</form>
-	</div>
-	<% } %>
-</div>
-
-<% include ../partials/vnf_profile %>
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-<script type="text/javascript">
-
-function addVnfProfile(form)
-{
-	var errorMsg='';
-	var vnf_type='';
-	var availability_zone_count='';
-	var equipment_role='';
-
-	if ( form.name == 'addForm' )
-	{
-		vnf_type = form.nf_vnf_type;
-		availability_zone_count = form.nf_availability_zone_count;
-		equipment_role = form.nf_equipment_role;
-	}
-
-	if ( (vnf_type.value == null) || (vnf_type.value == "") || isblank(vnf_type.value) )
-	{
-		errorMsg += 'VNF Type is required.<br>';
-	}
-	if ( (availability_zone_count.value == null) || (availability_zone_count.value == "") || isblank(availability_zone_count.value) )
-	{
-		errorMsg += 'Availability Zone Count is a required field.<br>';
-	}
-	if ( (equipment_role.value == null) || (equipment_role.value == "") || isblank(equipment_role.value) )
-	{
-		errorMsg += 'Equipment Role is a required field.<br>';
-	}
-	if( errorMsg.length > 0 ) {
-		bootbox.alert(errorMsg);
-		return;
-	}
-	if ( availability_zone_count.value.length > 0 && !isDigit(availability_zone_count.value) )
-    {
-        bootbox.alert('Availability Zone Count must be a number.');
-        return;
-    }
-	form.submit();
-}
-
-function deleteVnfProfile(vnf_type) {
-
-    bootbox.confirm({
-        message: "Are you sure you want to delete VNF_PROFILE [" + vnf_type + "]",
-        callback: function(result) {
-            if ( result )
-            {
-				location.assign("/mobility/deleteVnfProfile?vnf_type=" + vnf_type);
-
-            }
-            return;
-        },
-        buttons: {
-            cancel: {
-                label: "Cancel"
-            },
-            confirm: {
-                label: "Yes"
-            }
-        }
-    });
-}
-
-</script>
-
-</body>
-</html>
-
diff --git a/admportal/views/odl/cluster_status.ejs b/admportal/views/odl/cluster_status.ejs
deleted file mode 100644
index e7590dfe..00000000
--- a/admportal/views/odl/cluster_status.ejs
+++ /dev/null
@@ -1,84 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>SDN-C Cluster Status</h3>
-</div>
-
-
-<div class="container-fluid">
-	<table class="table table-hover table-condensed">
-      <thead>
-        <tr>
-		  <th>ShardName</th>
-		  <th>Status</th>
-          <th>Leader</th>
-          <th>RaftState</th>
-		  <th>View Response</th>
-        </tr>
-      </thead>
-      <tbody>
-		 <% var i=0; if (response_obj != 'undefined' )  {
-			 response_obj.forEach(function(request) { %>
-
-		<% if ( request.status == '200' ){ %>
-
-			<tr>
-            <td><%= request['value']['ShardName'] %></td>
-            <td><%= request.status %></td>
-            <td><%= request['value']['Leader'] %></td>
-            <td><%= request['value']['RaftState'] %></td>
-            <td>
-                <a class="btn btn-link" data-toggle="collapse"
-                    href="#collapseExample<%= i %>" aria-expanded="false"
-                    aria-controls="collapseExample"><%= request['value']['ShardName'] %>
-                </a>
-                <div class="collapse" id="collapseExample<%= i %>">
-                    <div class="well">
-                        <pre><%= JSON.stringify(request,null,4) %></pre>
-                    </div>
-                </div>
-           </td>
-        </tr>
-		<% } else { %>
-			 <tr>
-                <td>&nbsp;</td>
-                <td><%= request.status %></td>
-                <td>&nbsp;</td>
-                <td>&nbsp;</td>
-                <td>
-                <a class="btn btn-link" data-toggle="collapse"
-                    href="#collapseExample<%= i %>" aria-expanded="false"
-                    aria-controls="collapseExample">View
-                </a>
-                <div class="collapse" id="collapseExample<%= i %>">
-                    <div class="well">
-                        <pre><%= JSON.stringify(request,null,4) %></pre>
-                    </div>
-                </div>
-                </td>
-            </tr>
-
-		<% } %>
-		<% i++; }); }; %>
-
-      </tbody>
-    </table>
-</div>
-
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-</body>
-</html>
-
diff --git a/admportal/views/odl/listVRlan.ejs b/admportal/views/odl/listVRlan.ejs
deleted file mode 100644
index 93eedace..00000000
--- a/admportal/views/odl/listVRlan.ejs
+++ /dev/null
@@ -1,1069 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <title>SDN-C AdminPortal</title>
-  <meta charset="utf-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-</head>
-<body>
-
-<h2>VR-LAN</h2>
-
-<% if ( typeof result != 'undefined' ) {
-        if (result.code.length > 0) {
-            if ( result.code == 'success' ) { %>
-                <div class='alert alert-success' role='alert'>
-                <%
-                for ( x in result.msg ){ %>
-                    <div><%= result.msg[x] %></div>
-                <% } %>
-                </div>
-            <% } else { %>
-                <div class='alert alert-danger' role='danger'>
-                <%
-                for ( x in result.msg ){ %>
-                    <div><%= result.msg[x] %></div>
-                <% } %>
-                </div>
-            <% } %>
-        <% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-<div class="container-fluid">
-<div class="content">
-
-<% if ( typeof response_obj['vr-lan']['routing-protocol'] != 'undefined' ){ %>
-	<div class="content">
-	service-instance-id: <%= svc_instance_id %><br>
-	routing-protocol   : <%= response_obj['vr-lan']['routing-protocol'] %>
-	</div>
-<% } %>
-
-<table class="tree">
-
-<% var i=1; root_node=1;
-if ( typeof response_obj['vr-lan'] != 'undefined' )  
-{
-	if( typeof response_obj['vr-lan']['vr-lan-interface'] != 'undefined' )
-	{
-       	response_obj['vr-lan']['vr-lan-interface'].forEach(function(request) { 
-		var root_node = i %>
-
-		<tr class="treegrid-<%= i %>">
-            <td>vr-lan-interface</td>
-		</tr>
-		<% i++; %>
-
-		<% if ( request['vr-designation'] != 'undefined')
-		{
-			var vr_designation = request['vr-designation'];
-		} %> 
-
-		<tr class="treegrid-<%= i %> treegrid-parent-<%= root_node %>">
-        <td>
-			<a href="javascript:vrlan_interface(
-               '<%= svc_instance_id %>',
-               '<%= request['vr-designation'] %>',
-               '<%= request['v6-vr-lan-prefix'] %>',
-               '<%= request['v6-vr-lan-prefix-length'] %>',
-               '<%= request['v6-vce-wan-address'] %>',
-               '<%= request['v4-vr-lan-prefix-length'] %>',
-               '<%= request['v4-vr-lan-prefix'] %>',
-               '<%= request['t-defaulted-v6-vrlan'] %>',
-               '<%= request['v4-vce-loopback-address'] %>');">vr-lan-interface</a>
-		</td>
-		</tr>
-		<% i++; %>
-
-		<% if ( (typeof request['v6-public-lan-prefixes'] != 'undefined') && (typeof request['v6-public-lan-prefixes']['t-provided-v6-lan-public-prefixes'] != 'undefined') )
-        { %>
-        	<% request['v6-public-lan-prefixes']['t-provided-v6-lan-public-prefixes'].forEach(function(trequest){ var t_v6_root = i; %>
-				<tr class="treegrid-<%= i %> treegrid-parent-<%= root_node %>">
-				<td>v6-public-lan-prefixes</td>
-				</tr>
-				<% i++; %>
-				<tr class="treegrid-<%= i %> treegrid-parent-<%= t_v6_root %>">
-				<td>
-					<a href="javascript:t_provided_v6_prefixes(
-                       '<%= svc_instance_id %>',
-                       '<%= trequest['request-index'] %>',
-                       '<%= trequest['v6-next-hop-address'] %>',
-                       '<%= trequest['v6-lan-public-prefix-length'] %>',
-                       '<%= trequest['v6-lan-public-prefix'] %>');">t-provided-v6-lan-public-prefixes</a>
-				</td>
-				</tr>
-				<% i++; %>
-            <% }); %>
-        <% } %>
-
-		<% if ( typeof request['dhcp'] != 'undefined' )
-        { %>
-			<% var dhcp_node = i; %>
-			<tr class="treegrid-<%= i %> treegrid-parent-<%= root_node %>">
-			<td>dhcp</td>
-			</tr>
-			<% i++; %>
-
-			<tr class="treegrid-<%= i %> treegrid-parent-<%= dhcp_node %>">
-            <td>
-                <a href="javascript:dhcp(
-                   '<%= svc_instance_id %>',
-                   '<%= request['dhcp']['use-v4-default-pool'] %>',
-                   '<%= request['dhcp']['use-v6-default-pool'] %>',
-                   '<%= request['dhcp']['v4-dhcp-server-enabled'] %>',
-                   '<%= request['dhcp']['v6-dhcp-server-enabled'] %>',
-                   '<%= request['dhcp']['v6-dhcp-default-pool-prefix'] %>',
-                   '<%= request['dhcp']['v6-dhcp-default-pool-prefix-length'] %>',
-                   '<%= request['dhcp']['v4-dhcp-default-pool-prefix'] %>',
-                   '<%= request['dhcp']['v4-dhcp-default-pool-prefix-length'] %>');">dhcp</a>
-            </td>
-            </tr>
-			<% i++; %>
-
-			<% if ( typeof request['dhcp']['v4-dhcp-pools'] != 'undefined' )
-            { %>
-				<% var v4_dhcp_pools_node = i; %>
-				<tr class="treegrid-<%= i %> treegrid-parent-<%= dhcp_node %>">
-				<td>v4-dhcp-pool</td>
-				</tr>
-				<% i++; %>
-
-                <% request['dhcp']['v4-dhcp-pools'].forEach(function(v4request)
-                { %>
-                    <tr class="treegrid-<%= i %> treegrid-parent-<%= dhcp_node %>">
-                    <td>
-                        <a href="javascript:v4_dhcp_pools(
-                        '<%= svc_instance_id %>',
-                        '<%= v4request['v4-dhcp-relay-next-hop-address'] %>',
-                        '<%= v4request['v4-dhcp-pool-prefix'] %>',
-                        '<%= v4request['v4-dhcp-pool-prefix-length'] %>',
-                        '<%= v4request['v4-dhcp-relay-gateway-address'] %>');">v4-dhcp-pools</a>
-                    </td>
-                    </tr>
-                    <% i++; %>
-
-					<% if ( typeof v4request['excluded-v4-address'] != 'undefined' )
-                    { %>
-						<% var excluded_v4_address_node = i; %>
-						<tr class="treegrid-<%= i %> treegrid-parent-<%= v4_dhcp_node %>">
-							<td>exluded-v4-address</td>
-						</tr>
-						<% i++; %>
-
-                        <% v4request['excluded-v4-addresses'].forEach(function(ex_request)
-                        { %>
-                            <tr class="treegrid-<%= i %> treegrid-parent-<%= excluded_v4_address_node %>">
-                            <td>
-                                <a href="javascript:excluded_v4_address(
-                                '<%= svc_instance_id %>',
-                                '<%= ex_request['excluded-v4-address'] %>');">excluded-v4-address</a>
-                            </td>
-                            </tr>
-                            <% i++; %>
-                        <% }); %>
-                    <% } %>
-                <% }); %>
-        	<% } %>
-
-			<% if ( typeof request['dhcp']['excluded-v4-dhcp-addresses-from-default-pool'] != 'undefined' )
-            { %>
-				<% var exc_v4_address_node = i; %>
-				<tr class="treegrid-<%= i %> treegrid-parent-<%= dhcp_node %>">
-				<td>excluded-v4-dhcp-addresses-from-default-pool</td>
-				</tr>
-				<% i++; %>
-				
-				<% request['dhcp']['excluded-v4-dhcp-addresses-from-default-pool'].forEach(function(ex_request)
-                { %>
-                    <tr class="treegrid-<%= i %> treegrid-parent-<%= exc_v4_address_node %>">
-					<td>
-                        <a href="javascript:excluded_v4_addresses_from_default_pool(
-                        '<%= svc_instance_id %>',
-                        '<%= ex_request['excluded-v4-address'] %>');">excluded-v4-dhcp-addresses-from-default-pool</a>
-                    </td>
-                    </tr>
-                    </tr>
-                    <% i++; %>
-				<% }); %>
-			<% } %>
-
-			<% if ( typeof request['dhcp']['v6-dhcp-pools'] != 'undefined' )
-            { %>
-				<% var v6_dhcp_pools_node = i; %>
-                <tr class="treegrid-<%= i %> treegrid-parent-<%= dhcp_node %>">
-                <td>v6-dhcp-pool</td>
-                </tr>
-                <% i++; %>
-
-                <% request['dhcp']['v6-dhcp-pools'].forEach(function(v6request)
-                { %>
-                    <tr class="treegrid-<%= i %> treegrid-parent-<%= dhcp_node %>">
-                    <td>
-                        <a href="javascript:v6_dhcp_pools(
-                        '<%= svc_instance_id %>',
-                        '<%= v6request['v6-dhcp-relay-next-hop-address'] %>',
-                        '<%= v6request['v6-dhcp-pool-prefix'] %>',
-                        '<%= v6request['v6-dhcp-pool-prefix-length'] %>',
-                        '<%= v6request['v6-dhcp-relay-gateway-address'] %>');">v6-dhcp-pools</a>
-                    </td>
-                    </tr>
-                    <% i++; %>
-
-                    <% if ( typeof v4request['excluded-v6-addresses'] != 'undefined' )
-                    { %>
-                        <% var excluded_v6_address_node = i; %>
-                        <tr class="treegrid-<%= i %> treegrid-parent-<%= v6_dhcp_node %>">
-                            <td>exluded-v6-address</td>
-                        </tr>
-                        <% i++; %>
-
-                        <% v6request['excluded-v6-addresses'].forEach(function(ex_request)
-                        { %>
-                            <tr class="treegrid-<%= i %> treegrid-parent-<%= excluded_v6_address_node %>">
-                            <td>
-                                <a href="javascript:excluded_v6_address(
-                                '<%= svc_instance_id %>',
-                                '<%= ex_request['excluded-v6-address'] %>');">excluded-v6-address</a>
-                            </td>
-                            </tr>
-                            <% i++; %>
-                        <% }); %>
-                    <% } %>
-                <% }); %>
-			<% } %>
-
-			<% if ( typeof request['dhcp']['excluded-v6-dhcp-addresses-from-default-pool'] != 'undefined' )
-            { %>
-				<% var exc_v6_address_node = i; %>
-                <tr class="treegrid-<%= i %> treegrid-parent-<%= dhcp_node %>">
-                <td>excluded-v6-dhcp-addresses-from-default-pool</td>
-                </tr>
-                <% i++; %>
-
-                <% request['dhcp']['excluded-v6-dhcp-addresses-from-default-pool'].forEach(function(ex_request)
-                { %>
-                    <tr class="treegrid-<%= i %> treegrid-parent-<%= exc_v6_address_node %>">
-                    <td>
-                        <a href="javascript:excluded_v6_addresses_from_default_pool(
-                        '<%= svc_instance_id %>',
-                        '<%= ex_request['excluded-v6-address'] %>');">excluded-v6-dhcp-addresses-from-default-pool</a>
-                    </td>
-                    </tr>
-                    </tr>
-                    <% i++; %>
-                <% }); %>
-			<% } %>
-		<% } %>
-
-		<% if ( typeof request['firewall-lite'] != 'undefined' )
-        { %>
-			<% var firewall_lite_node = i; %>
-			<tr class="treegrid-<%= i %> treegrid-parent-<%= root_node %>">
-				<td>firewall-lite</td>
-			</tr>
-			<% i++; %>
-
-			<tr class="treegrid-<%= i %> treegrid-parent-<%= firewall_lite_node %>">
-            <td>
-                <a href="javascript:firewall_lite(
-                '<%= svc_instance_id %>',
-				'<%= vr_designation %>',
-                '<%= request['firewall-lite']['stateful-firewall-lite-v6-enabled'] %>',
-                '<%= request['firewall-lite']['stateful-firewall-lite-v4-enabled'] %>');">firewall-lite</a>
-            </td>
-            </tr>
-            <% i++; %>
-
-			<% if ( typeof request['firewall-lite']['v6-firewall-packet-filters'] != 'undefined' )
-            {
-                var v6_firewall_packet_filters_node = i; %>
-                <tr class="treegrid-<%= i %> treegrid-parent-<%= firewall_lite_node %>">
-                    <td>v6-firewall-packet-filters</td>
-                </tr>
-                <% i++; %>
-
-                <% request['firewall-lite']['v6-firewall-packet-filters'].forEach(function(v6request)
-                { %>
-                    <tr class="treegrid-<%= i %> treegrid-parent-<%= v6_firewall_packet_filters_node %>">
-                    <td>
-                        <a href="javascript:v6_firewall_packet_filters(
-                                    '<%= svc_instance_id %>',
-                                    '<%= v6request['v6-firewall-prefix'] %>',
-                                    '<%= v6request['v6-firewall-prefix-length'] %>',
-                                    '<%= v6request['allow-icmp-ping'] %>');">v6-firewall-packet-filters</a>
-                    </td>
-                    </tr>
-                    <% i++; %>
-
-                    <% if ( typeof v6request['udp-port-list'] != 'undefined' )
-                    { %>
-                        <% v6request['udp-port-list'].forEach(function(udp_request)
-                        { %>
-                            <tr class="treegrid-<%= i %> treegrid-parent-<%= v6_firewall_packet_filters_node %>">
-                            <td>
-                                <a href="javascript:udp_port_list(
-                                '<%= svc_instance_id %>',
-                                '<%= udp_request['port-number'] %>');">udp-port-list</a>
-                            </td>
-                            </tr>
-                            <% i++; %>
-                        <% }); %>
-                    <% } %>
-                    <% if ( typeof v6p_request['tcp-port-list'] != 'undefined' )
-                    { %>
-                        <% v6request['tcp-port-list'].forEach(function(tcp_request)
-                        { %>
-                            <tr class="treegrid-<%= i %> treegrid-parent-<%= v6_firewall_packet_filters_node %>">
-                            <td>
-                                <a href="javascript:tcp_port_list(
-                                '<%= svc_instance_id %>',
-                                '<%= tcp_request['port-number'] %>');">tcp-port-list</a>
-                            </td>
-                            </tr>
-                            <% i++; %>
-                        <% }); %>
-                    <% } %>
-                <% }); %>
-            <% } %>
-			<% if ( typeof request['firewall-lite']['v4-firewall-packet-filters'] != 'undefined' )
-            {
-                var v4_firewall_packet_filters_node = i; %>
-                <tr class="treegrid-<%= i %> treegrid-parent-<%= firewall_lite_node %>">
-                    <td>v4-firewall-packet-filters</td>
-                </tr>
-                <% i++; %>
-
-                <% request['firewall-lite']['v4-firewall-packet-filters'].forEach(function(v4request)
-                { %>
-                    <tr class="treegrid-<%= i %> treegrid-parent-<%= v4_firewall_packet_filters_node %>">
-                    <td>
-                        <a href="javascript:v4_firewall_packet_filters(
-                                    '<%= svc_instance_id %>',
-                                    '<%= v4request['v4-firewall-prefix'] %>',
-                                    '<%= v4request['v4-firewall-prefix-length'] %>',
-                                    '<%= v4request['allow-icmp-ping'] %>');">v4-firewall-packet-filters</a>
-                    </td>
-                    </tr>
-                    <% i++; %>
-
-                    <% if ( typeof v4request['udp-port-list'] != 'undefined' )
-                    { %>
-                        <% v4request['udp-port-list'].forEach(function(udp_request)
-                        { %>
-                            <tr class="treegrid-<%= i %> treegrid-parent-<%= v4_firewall_packet_filters_node %>">
-                            <td>
-                                <a href="javascript:udp_port_list(
-                                '<%= svc_instance_id %>',
-                                '<%= udp_request['port-number'] %>');">udp-port-list</a>
-                            </td>
-                            </tr>
-                            <% i++; %>
-                        <% }); %>
-                    <% } %>
-                    <% if ( typeof v4p_request['tcp-port-list'] != 'undefined' )
-                    { %>
-                        <% v4request['tcp-port-list'].forEach(function(tcp_request)
-                        { %>
-                            <tr class="treegrid-<%= i %> treegrid-parent-<%= v4_firewall_packet_filters_node %>">
-                            <td>
-                                <a href="javascript:tcp_port_list(
-                                '<%= svc_instance_id %>',
-                                '<%= tcp_request['port-number'] %>');">tcp-port-list</a>
-                            </td>
-                            </tr>
-                            <% i++; %>
-                        <% }); %>
-                    <% } %>
-                <% }); %>
-            <% } %>
-
-		<% } %>
-
-		<% if ( typeof request['static-routes'] != 'undefined' )
-		{ 
-			var static_route_node = i; %>
-			<tr class="treegrid-<%= i %> treegrid-parent-<%= root_node %>">
-        	<td>static-routes</td>
-			</tr>
-			<% i++; %>
-            <% if ( typeof request['static-routes']['v6-static-routes'] != 'undefined' )
-            { %>
-				<% v6_static_route = i %>
-				<tr class="treegrid-<%= i %> treegrid-parent-<%= static_route_node %>">
-				<td>v6-static-routes</td>
-				</tr>
-				<% i++; %>
-			
-                <% request['static-routes']['v6-static-routes'].forEach(function(strequest){ %>
-					<tr class="treegrid-<%= i %> treegrid-parent-<%= v6_static_route %>">
-					<td>
-						<a href="javascript:v6_static_routes(
-                       	'<%= svc_instance_id %>',
-                        '<%= strequest['v6-static-route-prefix'] %>',
-                        '<%= strequest['v6-next-hop-address'] %>',
-                        '<%= strequest['v6-static-route-prefix-length'] %>');">v6-static-routes</a>
-					</td>
-					</tr>
-					<% i++; %>
-                <% }); %>
-            <% } %>
-            <% if ( typeof request['static-routes']['v4-static-routes'] != 'undefined' )
-            { %>
-				<% v4_static_route = i %>
-				<tr class="treegrid-<%= i %> treegrid-parent-<%= static_route_node %>">
-				<td>v4-static-routes</td>
-				</tr>
-				<% i++; %>
-                <% request['static-routes']['v4-static-routes'].forEach(function(v4request)
-				{ %>
-					<tr class="treegrid-<%= i %> treegrid-parent-<%= v4_static_route %>">
-					<td>
-						<a href="javascript:v4_static_routes(
-                       	'<%= svc_instance_id %>',
-                        '<%= v4request['v4-static-route-prefix'] %>',
-                        '<%= v4request['v4-next-hop-address'] %>',
-                        '<%= v4request['v4-static-route-prefix-length'] %>');">v4-static-routes</a>
-					</td>
-					</tr>
-					<% i++; %>
-                <% }); %>
-			<% } %>
-		<% } %>
-		<% if ( typeof request['pat'] != 'undefined' )
-        { %>
-			<% var pat_node = i %>
-			<tr class="treegrid-<%= i %> treegrid-parent-<%= root_node %>">
-				<td>pat</td>
-			</tr>
-			<% i++; %>
-
-			<tr class="treegrid-<%= i %> treegrid-parent-<%= pat_node %>">
-			<td>
-				<a href="javascript:pat(
-               	'<%= svc_instance_id %>',
-               	'<%= request['pat']['v4-pat-default-pool-prefix-length'] %>',
-               	'<%= request['pat']['use-v4-default-pool'] %>',
-               	'<%= request['pat']['v4-pat-enabled'] %>',
-               	'<%= request['pat']['v4-pat-default-pool-prefix'] %>');">pat</a>
-			</td>
-			</tr>
-			<% i++; %>
-
-			<% if ( typeof request['pat']['v4-pat-pools'] != 'undefined' )
-			{ 
-				var pat_pools_node = i %>
-				<tr class="treegrid-<%= i %> treegrid-parent-<%= pat_node %>">
-					<td>v4-pat-pools</td>
-				</tr>
-				<% i++; %>
-
-        		<% request['pat']['v4-pat-pools'].forEach(function(trequest)
-				{ %>
-				<tr class="treegrid-<%= i %> treegrid-parent-<%= pat_pools_node %>">
-				<td>
-					<a href="javascript:pat_pools(
-                    '<%= svc_instance_id %>',
-                    '<%= trequest['v4-pat-pool-next-hop-address'] %>',
-                    '<%= trequest['v4-pat-pool-prefix-length'] %>',
-                    '<%= trequest['v4-pat-pool-prefix'] %>');">v4-pat-pools</a>
-				</td>
-				</tr>
-				<% }); %> 
-				<% i++; %>
-			
-        	<% } %>
-		<% } %>
-		<% if ( typeof request['nat'] != 'undefined' )
-        { %>
-            <% var nat_node = i %>
-            <tr class="treegrid-<%= i %> treegrid-parent-<%= root_node %>">
-                <td>nat</td>
-            </tr>
-            <% i++; %>
-
-            <tr class="treegrid-<%= i %> treegrid-parent-<%= nat_node %>">
-            <td>
-                <a href="javascript:nat(
-                '<%= svc_instance_id %>',
-                '<%= request['pat']['v4-nat-enabled'] %>');">nat</a>
-            </td>
-            </tr>
-            <% i++; %>
-
-            <% if ( typeof request['nat']['v4-nat-mapping-entries'] != 'undefined' )
-            {
-                var nat_mapping_node = i %>
-                <tr class="treegrid-<%= i %> treegrid-parent-<%= nat_node %>">
-                    <td>v4-nat-mapping-entries</td>
-                </tr>
-                <% i++; %>
-
-                <% request['nat']['v4-nat-mapping-entries'].forEach(function(trequest)
-                { %>
-                <tr class="treegrid-<%= i %> treegrid-parent-<%= nat_mapping_node %>">
-                <td>
-                    <a href="javascript:v4_nat_mapping_entries(
-                    '<%= svc_instance_id %>',
-                    '<%= trequest['v4-nat-external'] %>',
-                    '<%= trequest['v4-nat-next-hop-address'] %>',
-                    '<%= trequest['v4-nat-internal'] %>');">v4-nat-mapping-entries</a>
-                </td>
-                </tr>
-                <% }); %>
-                <% i++; %>
-
-            <% } %>
-        <% } %>
-
-		<% if ( (typeof request['v4-public-lan-prefixes'] != 'undefined') && (typeof request['v4-public-lan-prefixes']['t-provided-v4-lan-public-prefixes'] != 'undefined') )
-        { %>
-        	<% request['v4-public-lan-prefixes']['t-provided-v4-lan-public-prefixes'].forEach(function(trequest){ 
-				var v4_public_root = i; %>
-				<tr class="treegrid-<%= i %> treegrid-parent-<%= root_node %>">
-				<td>v4-public-lan-prefixes</td>
-				</tr>
-				<% i++; %>
-				<tr class="treegrid-<%= i %> treegrid-parent-<%= v4_public_root %>">
-				<td>
-					<a href="javascript:t_provided_v4_prefixes(
-                    '<%= svc_instance_id %>',
-                    '<%= trequest['request-index'] %>',
-                    '<%= trequest['v4-lan-public-prefix-length'] %>',
-                    '<%= trequest['v4-lan-public-prefix'] %>');">t-provided-v4-lan-public-prefixes</a>
-				</td>
-				</tr>
-				<% i++; %>
-            <% }); %>
-        <% } %>
-		<% }); 
-	} 
-} else { %>
-			<div><pre>no data</pre></div>
-<% } %>
-</table>
-</div>
-</div>
-
-   <% include ../partials/vr_lan_interface %>
-   <% include ../partials/dhcp %>
-   <% include ../partials/v4_dhcp_pools %>
-   <% include ../partials/v6_dhcp_pools %>
-   <% include ../partials/excluded_v4_address %>
-   <% include ../partials/excluded_v4_address_from_default_pool %>
-   <% include ../partials/excluded_v6_address_from_default_pool %>
-   <% include ../partials/t_provided_v6_lan_public_prefixes %>
-   <% include ../partials/firewall_lite %>
-   <% include ../partials/v6_static_routes %>
-   <% include ../partials/v4_static_routes %>
-   <% include ../partials/pat %>
-   <% include ../partials/pat_pools %>
-   <% include ../partials/nat %>
-   <% include ../partials/v4_nat_mapping_entries %>
-   <% include ../partials/t_provided_v4_lan_public_prefixes %>
-   <% include ../partials/v6_firewall_packet_filters %>
-   <% include ../partials/v4_firewall_packet_filters %>
-   <% include ../partials/udp_port_list %>
-   <% include ../partials/tcp_port_list %>
-   <footer>
-       <% include ../partials/footer %>
-   </footer>
-    
-<script type="text/javascript">
-
-$(document).ready(function() {
-        $('.tree').treegrid( { initialState: 'collapsed' } );
-});
-
-function excluded_v4_addresses_from_default_pool(svc_instance_id, excluded_v4_address)
-{
-    document.getElementById('svc_instance_id').value = svc_instance_id;
-    var lvalue = document.getElementById('excluded_v4_address_from_default_pool');
-    if( excluded_v4_address != 'undefined' ){
-        lvalue.value=excluded_v4_address;
-    } else {
-        lvalue.value='';
-    }
-    $('#excluded-v4-address-from-default-pool-modal').modal('show');
-}
-function excluded_v6_addresses_from_default_pool(svc_instance_id, excluded_v6_address)
-{
-    document.getElementById('svc_instance_id').value = svc_instance_id;
-    var lvalue = document.getElementById('excluded_v6_address');
-    if( excluded_v6_address != 'undefined' ){
-        lvalue.value=excluded_v6_address;
-    } else {
-        lvalue.value='';
-    }
-    $('#excluded-v6-address-modal').modal('show');
-}
-function excluded_v4_addresses_from_default_pool(svc_instance_id, excluded_v4_address)
-{
-    document.getElementById('svc_instance_id').value = svc_instance_id;
-    var lvalue = document.getElementById('excluded_v4_address');
-    if( excluded_v4_address != 'undefined' ){
-        lvalue.value=excluded_v4_address;
-    } else {
-        lvalue.value='';
-    }
-    $('#excluded-v4-address-modal').modal('show');
-}
-function exluded_v4_address(svc_instance_id, excluded_v4_address)
-{
-    document.getElementById('svc_instance_id').value = svc_instance_id;
-    var lvalue = document.getElementById('excluded_v4_address');
-    if( excluded_v4_address != 'undefined' ){
-        lvalue.value=excluded_v4_address;
-    } else {
-        lvalue.value='';
-    }
-    $('#excluded-v4-address-modal').modal('show');
-}
-
-function v6_dhcp_pools(svc_instance_id,v6_dhcp_relay_next_hop_address,v6_dhcp_pool_prefix,v6_dhcp_pool_prefix_length,v6_dhcp_relay_gateway_address)
-{
-    document.getElementById('svc_instance_id').value = svc_instance_id;
-    var lvalue = document.getElementById('v6_dhcp_relay_next_hop_address');
-    if( v6_dhcp_relay_next_hop_address != 'undefined' ){
-        lvalue.value=v6_dhcp_relay_next_hop_address;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v6_dhcp_pool_prefix');
-    if( v6_dhcp_pool_prefix != 'undefined' ){
-        lvalue.value=v6_dhcp_pool_prefix;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v6_dhcp_pool_prefix_length');
-    if( v6_dhcp_pool_prefix_length != 'undefined' ){
-        lvalue.value=v6_dhcp_pool_prefix_length;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v6_dhcp_relay_gateway_address');
-    if( v6_dhcp_relay_gateway_address != 'undefined' ){
-        lvalue.value=v6_dhcp_relay_gateway_address;
-    } else {
-        lvalue.value='';
-    }
-    $('#v6-dhcp-pools-modal').modal('show');
-}
-
-function v4_dhcp_pools(svc_instance_id,v4_dhcp_relay_next_hop_address,v4_dhcp_pool_prefix,v4_dhcp_pool_prefix_length,v4_dhcp_relay_gateway_address)
-{
-    document.getElementById('svc_instance_id').value = svc_instance_id;
-    var lvalue = document.getElementById('v4_dhcp_relay_next_hop_address');
-    if( v4_dhcp_relay_next_hop_address != 'undefined' ){
-        lvalue.value=v4_dhcp_relay_next_hop_address;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v4_dhcp_pool_prefix');
-    if( v4_dhcp_pool_prefix != 'undefined' ){
-        lvalue.value=v4_dhcp_pool_prefix;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v4_dhcp_pool_prefix_length');
-    if( v4_dhcp_pool_prefix_length != 'undefined' ){
-        lvalue.value=v4_dhcp_pool_prefix_length;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v4_dhcp_relay_gateway_address');
-    if( v4_dhcp_relay_gateway_address != 'undefined' ){
-        lvalue.value=v4_dhcp_relay_gateway_address;
-    } else {
-        lvalue.value='';
-    }
-    $('#v4-dhcp-pools-modal').modal('show');
-}
-
-function dhcp(svc_instance_id,use_v4_default_pool,use_v6_default_pool,v4_dhcp_server_enabled,v6_dhcp_server_enabled,v6_dhcp_default_pool_prefix,v6_dhcp_default_pool_prefix_length,v4_dhcp_default_pool_prefix,v4_dhcp_default_pool_prefix_length)
-{
-    document.getElementById('svc_instance_id').value = svc_instance_id;
-    var lvalue = document.getElementById('use_v4_default_pool');
-    if( use_v4_default_pool != 'undefined' ){
-        lvalue.value=use_v4_default_pool;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('use_v6_default_pool');
-    if( use_v6_default_pool != 'undefined' ){
-        lvalue.value=use_v6_default_pool;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v4_dhcp_server_enabled');
-    if( v4_dhcp_server_enabled != 'undefined' ){
-        lvalue.value=v4_dhcp_server_enabled;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v6_dhcp_server_enabled');
-    if( v6_dhcp_server_enabled != 'undefined' ){
-        lvalue.value=v6_dhcp_server_enabled;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v6_dhcp_default_pool_prefix');
-    if( v6_dhcp_default_pool_prefix != 'undefined' ){
-        lvalue.value=v6_dhcp_default_pool_prefix;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v6_dhcp_default_pool_prefix_length');
-    if( v6_dhcp_default_pool_prefix_length != 'undefined' ){
-        lvalue.value=v6_dhcp_default_pool_prefix_length;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v4_dhcp_default_pool_prefix');
-    if( v4_dhcp_default_pool_prefix != 'undefined' ){
-        lvalue.value=v4_dhcp_default_pool_prefix;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v4_dhcp_default_pool_prefix_length');
-    if( v4_dhcp_default_pool_prefix_length != 'undefined' ){
-        lvalue.value=v4_dhcp_default_pool_prefix_length;
-    } else {
-        lvalue.value='';
-    }
-    $('#dhcp-modal').modal('show');
-}
-
-function tcp_port_list(svc_instance_id,tcp_port_number)
-{
-	document.getElementById('svc_instance_id').value = svc_instance_id;
-	var lvalue = document.getElementById('tcp_port_number');
-    if( tcp_port_number != 'undefined' ){
-    	lvalue.value=tcp_port_number;
-    } else {
-    	lvalue.value='';
-	}
-    $('#tcp-port-list-modal').modal('show');
-}
-function udp_port_list(svc_instance_id,udp_port_number)
-{
-	document.getElementById('svc_instance_id').value = svc_instance_id;
-	var lvalue = document.getElementById('udp_port_number');
-    if( udp_port_number != 'undefined' ){
-    	lvalue.value=udp_port_number;
-    } else {
-    	lvalue.value='';
-	}
-    $('#udp-port-list-modal').modal('show');
-}
-function v4_firewall_packet_filters(svc_instance_id,v4_firewall_prefix,v4_firewall_prefix_length,v4_allow_icmp_ping)
-{
-    document.getElementById('svc_instance_id').value = svc_instance_id;
-    var lvalue = document.getElementById('v4_firewall_prefix');
-    if( v4_firewall_prefix != 'undefined' ){
-        lvalue.value=v4_firewall_prefix;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v4_firewall_prefix_length');
-    if( v4_firewall_prefix_length != 'undefined' ){
-        lvalue.value=v4_firewall_prefix_length;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v4_allow_icmp_ping');
-    if( v4_allow_icmp_ping != 'undefined' ){
-        lvalue.value=v4_allow_icmp_ping;
-    } else {
-        lvalue.value='';
-    }
-    $('#v4-firewall-packet-filters-modal').modal('show');
-}
-
-function v6_firewall_packet_filters(svc_instance_id,v6_firewall_prefix,v6_firewall_prefix_length,v6_allow_icmp_ping)
-{
-	document.getElementById('svc_instance_id').value = svc_instance_id;
-	var lvalue = document.getElementById('v6_firewall_prefix');
-    if( v6_firewall_prefix != 'undefined' ){
-    	lvalue.value=v6_firewall_prefix;
-    } else {
-    	lvalue.value='';
-	}
-	lvalue = document.getElementById('v6_firewall_prefix_length');
-    if( v6_firewall_prefix_length != 'undefined' ){
-    	lvalue.value=v6_firewall_prefix_length;
-    } else {
-    	lvalue.value='';
-	}
-	lvalue = document.getElementById('v6_allow_icmp_ping');
-    if( v6_allow_icmp_ping != 'undefined' ){
-    	lvalue.value=v6_allow_icmp_ping;
-    } else {
-    	lvalue.value='';
-	}
-    $('#v6-firewall-packet-filters-modal').modal('show');
-} function nat(svc_instance_id,v4_nat_enabled) {
-	document.getElementById('svc_instance_id').value = svc_instance_id;
-	var lvalue = document.getElementById('v4_nat_enabled');
-    if( v4_nat_enabled != 'undefined' ){
-    	lvalue.value=v4_nat_enabled;
-    } else {
-    	lvalue.value='';
-	}
-    $('#nat-modal').modal('show');
-}
-function v4_nat_mapping_entries(svc_instance_id,v4_nat_external,v4_nat_next_hop_address,v4_nat_internal)
-{
-	document.getElementById('svc_instance_id').value = svc_instance_id;
-	var lvalue = document.getElementById('v4_nat_external');
-    if( v4_nat_external != 'undefined' ){
-    	lvalue.value=v4_nat_external;
-    } else {
-    	lvalue.value='';
-	}
-	lvalue = document.getElementById('v4_nat_next_hop_address');
-    if( v4_nat_next_hop_address != 'undefined' ){
-    	lvalue.value=v4_nat_next_hop_address;
-    } else {
-    	lvalue.value='';
-	}
-	lvalue = document.getElementById('v4_nat_internal');
-    if( v4_nat_internal != 'undefined' ){
-    	lvalue.value=v4_nat_internal;
-    } else {
-    	lvalue.value='';
-	}
-    $('#v4-nat-mapping-entries-modal').modal('show');
-}
-function pat_pools(svc_instance_id,v4_pat_pool_next_hop_address,v4_pat_pool_prefix_length,v4_pat_pool_prefix)
-{
-	document.getElementById('svc_instance_id').value = svc_instance_id;
-	var lvalue = document.getElementById('v4_pat_pool_next_hop_address');
-    if( v4_pat_pool_next_hop_address != 'undefined' ){
-    	lvalue.value=v4_pat_pool_next_hop_address;
-    } else {
-    	lvalue.value='';
-	}
-	lvalue = document.getElementById('v4_pat_pool_prefix_length');
-    if( v4_pat_pool_prefix_length != 'undefined' ){
-    	lvalue.value=v4_pat_pool_prefix_length;
-    } else {
-    	lvalue.value='';
-	}
-	lvalue = document.getElementById('v4_pat_pool_prefix');
-    if( v4_pat_pool_prefix != 'undefined' ){
-    	lvalue.value=v4_pat_pool_prefix;
-    } else {
-    	lvalue.value='';
-	}
-    $('#pat-pools-modal').modal('show');
-}
-function pat(svc_instance_id,v4_pat_default_pool_prefix_length,use_v4_default_pool,v4_pat_enabled,v4_pat_default_pool_prefix)
-{
-	document.getElementById('svc_instance_id').value = svc_instance_id;
-	var lvalue = document.getElementById('v4_pat_default_pool_prefix_length');
-    if( v4_pat_default_pool_prefix_length != 'undefined' ){
-    	lvalue.value=v4_pat_default_pool_prefix_length;
-    } else {
-    	lvalue.value='';
-	}
-
-	lvalue = document.getElementById('use_v4_default_pool');
-    if( use_v4_default_pool != 'undefined' ){
-    	lvalue.value = use_v4_default_pool;
-    } else {
-    	lvalue.value = '';
-    }
-
-	lvalue = document.getElementById('v4_pat_enabled');
-    if( v4_pat_enabled != 'undefined' ){
-    	lvalue.value = v4_pat_enabled;
-    } else {
-    	lvalue.value = '';
-	}
-
-	lvalue = document.getElementById('v4_pat_default_pool_prefix');
-    if( v4_pat_default_pool_prefix != 'undefined' ){
-    	lvalue.value = v4_pat_default_pool_prefix;
-    } else {
-    	lvalue.value = '';
-	}
-    $('#pat-modal').modal('show');
-}
-function v4_static_routes(svc_instance_id,v4_static_route_prefix,static_v4_next_hop_address,v4_static_route_prefix_length)
-{
-	document.getElementById('svc_instance_id').value = svc_instance_id;
-    var lvalue = document.getElementById('v4_static_route_prefix');
-    if( v4_static_route_prefix != 'undefined' ){
-        lvalue.value=v4_static_route_prefix;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('static_v4_next_hop_address');
-    if( static_v4_next_hop_address != 'undefined' ){
-        lvalue.value=static_v4_next_hop_address;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v4_static_route_prefix_length');
-    if( v4_static_route_prefix_length != 'undefined' ){
-        lvalue.value=v4_static_route_prefix_length;
-    } else {
-        lvalue.value='';
-    }
-    $('#v4-static-routes-modal').modal('show');
-}
-
-function v6_static_routes(svc_instance_id,v6_static_route_prefix,static_v6_next_hop_address,v6_static_route_prefix_length)
-{
-	document.getElementById('svc_instance_id').value = svc_instance_id;
-    var lvalue = document.getElementById('v6_static_route_prefix');
-    if( v6_static_route_prefix != 'undefined' ){
-        lvalue.value=v6_static_route_prefix;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('static_v6_next_hop_address');
-    if( static_v6_next_hop_address != 'undefined' ){
-        lvalue.value=static_v6_next_hop_address;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v6_static_route_prefix_length');
-    if( v6_static_route_prefix_length != 'undefined' ){
-        lvalue.value=v6_static_route_prefix_length;
-    } else {
-        lvalue.value='';
-    }
-    $('#v6-static-routes-modal').modal('show');
-}
-function firewall_lite(svc_instance_id,firewall_lite_vr_designation,stateful_firewall_lite_v4_enabled,stateful_firewall_lite_v6_enabled)
-{
-	document.getElementById('svc_instance_id').value = svc_instance_id;
-	document.getElementById('firewall_lite_vr_designation').value = firewall_lite_vr_designation;
-    var lvalue = document.getElementById('stateful_firewall_lite_v4_enabled');
-    if( stateful_firewall_lite_v4_enabled != 'undefined' ){
-        lvalue.value=stateful_firewall_lite_v4_enabled;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('stateful_firewall_lite_v6_enabled');
-    if( stateful_firewall_lite_v6_enabled != 'undefined' ){
-        lvalue.value=stateful_firewall_lite_v6_enabled;
-    } else {
-        lvalue.value='';
-    }
-    $('#firewall-lite-modal').modal('show');
-}
-function t_provided_v6_prefixes(svc_instance_id,v6_request_index,v6_lan_public_prefix_length,v6_lan_public_prefix)
-{
-	document.getElementById('svc_instance_id').value = svc_instance_id;
-	var lvalue = document.getElementById('v6_request_index'); 
-	if( v6_request_index != 'undefined' ){
-		lvalue.value=v6_request_index;
-	} else {
-		lvalue.value='';
-	}
-	lvalue = document.getElementById('v6_lan_public_prefix_length'); 
-	if( v6_lan_public_prefix_length != 'undefined' ){
-		lvalue.value=v6_lan_public_prefix_length;
-	} else {
-		lvalue.value='';
-	}
-	lvalue = document.getElementById('v6_lan_public_prefix'); 
-	if( v6_lan_public_prefix != 'undefined' ){
-		lvalue.value=v6_lan_public_prefix;
-	} else {
-		lvalue.value='';
-	}
-	$('#t-provided-v6-lan-public-prefixes-modal').modal('show');
-}
-function t_provided_v4_prefixes(svc_instance_id,v4_request_index,v4_lan_public_prefix_length,v4_lan_public_prefix)
-{
-	document.getElementById('svc_instance_id').value = svc_instance_id;
-    var lvalue = document.getElementById('v4_request_index');
-    if( v4_request_index != 'undefined' ){
-        lvalue.value=v4_request_index;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v4_lan_public_prefix_length');
-    if( v4_lan_public_prefix_length != 'undefined' ){
-        lvalue.value=v4_lan_public_prefix_length;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v4_lan_public_prefix');
-    if( v4_lan_public_prefix != 'undefined' ){
-        lvalue.value=v4_lan_public_prefix;
-    } else {
-        lvalue.value='';
-    }
-    $('#t-provided-v4-lan-public-prefixes-modal').modal('show');
-}
-
-function vrlan_interface(svc_instance_id,vr_designation,v6_vr_lan_prefix, v6_vr_lan_prefix_length, v6_vce_wan_address, v4_vr_lan_prefix_length, v4_vr_lan_prefix, t_defaulted_v6_vrlan,v4_vce_loopback_address)
-{
-	document.getElementById('svc_instance_id').value = svc_instance_id;
-	var lvalue = document.getElementById('vr_designation'); 
-	if( vr_designation != 'undefined' ){
-		lvalue.value=vr_designation;
-	} else {
-		lvalue.value='';
-	}
-	lvalue = document.getElementById('v6_vr_lan_prefix'); 
-	if( v6_vr_lan_prefix != 'undefined' ){
-		lvalue.value=v6_vr_lan_prefix;
-	} else {
-		lvalue.value='';
-	}
-	lvalue = document.getElementById('v6_vr_lan_prefix_length'); 
-	if( v6_vr_lan_prefix_length != 'undefined' ){
-		lvalue.value=v6_vr_lan_prefix_length;
-	} else {
-		lvalue.value='';
-	}
-	lvalue = document.getElementById('v6_vce_wan_address'); 
-	if( v6_vce_wan_address != 'undefined' ){
-		lvalue.value=v6_vce_wan_address;
-	} else {
-		lvalue.value='';
-	}
-	lvalue = document.getElementById('v4_vr_lan_prefix_length'); 
-	if( v4_vr_lan_prefix_length != 'undefined' ){
-		lvalue.value=v4_vr_lan_prefix_length;
-	} else {
-		lvalue.value='';
-	}
-	lvalue = document.getElementById('v4_vr_lan_prefix'); 
-	if( v4_vr_lan_prefix != 'undefined' ){
-		lvalue.value=v4_vr_lan_prefix;
-	} else {
-		lvalue.value='';
-	}
-	lvalue = document.getElementById('v4_vce_loopback_address'); 
-	if( v4_vce_loopback_address != 'undefined' ){
-		lvalue.value=v4_vce_loopback_address;
-	} else {
-		lvalue.value='';
-	}
-	lvalue = document.getElementById('t_defaulted_v6_vrlan'); 
-	if( t_defaulted_v6_vrlan != 'undefined' ){
-		lvalue.value=t_defaulted_v6_vrlan;
-	} else {
-		lvalue.value='';
-	}
-	$('#vr-lan-interface-modal').modal('show');
-}
-</script>
-
-</body>
-</html>
-
diff --git a/admportal/views/odl/listWklst.ejs b/admportal/views/odl/listWklst.ejs
deleted file mode 100644
index 432c2071..00000000
--- a/admportal/views/odl/listWklst.ejs
+++ /dev/null
@@ -1,2224 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <title>SDN-C AdminPortal</title>
-  <meta charset="utf-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-
-<script type="text/javascript">
-$(document).ready(function() {
-        $('.tree').treegrid( { initialState: 'collapsed' } );
-});
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>L3SDN-API Services</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-        if (result.code.length > 0) {
-            if ( result.code == 'success' ) { %>
-                <div class='alert alert-success' role='alert'><%=result.msg %></div>
-            <% } else { %>
-                <div class='alert alert-danger' role='danger'><%=result.msg %></div>
-            <% } %>
-        <% } %>
-<% } %>
-
-<div class="container-fluid">
-<div class="content">
-
-<table class="table tree table-hover table-condensed">
-<% var i=1; root_node=1;
-pageInfo.rows.forEach(function(request)
-{
-        root_node = i; %>
-
-		<tr class="treegrid-<%= i %>">
-		  	<td><%= request['service-instance-id'] %></td>
-		</tr>
-		<% i++; %>
-
-		<% if ( typeof request['service-status'] != 'undefined' )
-        { %>
-        	<tr class="treegrid-<%= i %>> treegrid-parent-<%= root_node %>">
-			<td>			
-				<a class=""
-                   		href="javascript:serviceStatus(
-                       '<%= request['service-status']['rpc-name'] %>',
-                       '<%= request['service-status']['final-indicator'] %>',
-                       '<%= request['service-status']['request-status'] %>',
-                       '<%= request['service-status']['rpc-action'] %>',
-                       '<%= request['service-status']['l3sdn-action'] %>',
-                       '<%= request['service-status']['l3sdn-subaction'] %>',
-                       '<%= request['service-status']['response-message'] %>',
-                       '<%= request['service-status']['response-code'] %>',
-                       '<%= request['service-status']['response-timestamp'] %>' );">service-status</a>
-			</td>
-			</tr>
-			<% i++; %>
-        <% } %>
-		<% if ( typeof request['service-data'] != 'undefined' )
-		{ %>
-			<% var service_data_node = i; %>
-        	<tr class="treegrid-<%= i %> treegrid-parent-<%= root_node %>">
-				<td> service-data</td>
-			</tr>
-			<% i++; %>
-
-			<% if ( typeof request['service-data']['internet-evc-access-information'] != 'undefined' )
-           	{ %>
-        		<tr class="treegrid-<%= i %> treegrid-parent-<%= service_data_node %>">
-				<td>
-                   	<a class=""
-                   		href="javascript:internetInfo(
-                       		'<%= request['service-data']['internet-evc-access-information']['ip-version'] %>',
-                       		'<%= request['service-data']['internet-evc-access-information']['internet-evc-speed-value'] %>',
-                       		'<%= request['service-data']['internet-evc-access-information']['internet-evc-speed-units'] %>');">internet-evc-access-information</a>
-				</td>
-				</tr>
-				<% i++; %>
-			<% } %>
-		<% if ( typeof request['service-data']['oper-status'] != 'undefined' )
-    	{ %>
-        	<tr class="treegrid-<%= i %> treegrid-parent-<%= service_data_node %>">
-			<td>
-			<a class=""
-           		href="javascript:operStatus(
-                    '<%= request['service-data']['oper-status']['order-status'] %>',
-                    '<%= request['service-data']['oper-status']['modify-timestamp'] %>',
-                    '<%= request['service-data']['oper-status']['last-svc-request-id'] %>',
-                    '<%= request['service-data']['oper-status']['last-sub-action'] %>',
-                    '<%= request['service-data']['oper-status']['t-defaulted-v6-vrlan'] %>',
-                    '<%= request['service-data']['oper-status']['last-action'] %>',
-                    '<%= request['service-data']['oper-status']['create-timestamp'] %>',
-                    '<%= request['service-data']['oper-status']['maintenance-indicator'] %>',
-                    '<%= request['service-data']['oper-status']['last-order-status'] %>');">oper-status</a>
-			</td>
-			</tr>
-			<% i = i+1; %>
-		<% } %>
-		<% if ( typeof request['service-data']['svc-topology-additional-data'] != 'undefined' )
-    	{ %>
-        	<tr class="treegrid-<%= i %> treegrid-parent-<%= service_data_node %>">
-			<td>
-			<a class=""
-           		href="javascript:svcTopo(
-               '<%= request['service-data']['svc-topology-additional-data']['svc-vnf-type'] %>');">svc-topology-additional-data</a>
-			</td>
-			</tr>
-			<% i = i+1; %>
-		<% }  %>
-		<% if ( typeof request['service-data']['request-information'] != 'undefined' )
-		{ %>
-        	<tr class="treegrid-<%= i %> treegrid-parent-<%= service_data_node %>">
-			<td>
-			<a class=""
-               href="javascript:reqInfo(
-               	'<%= request['service-data']['request-information']['notification-url'] %>',
-                '<%= request['service-data']['request-information']['source'] %>',
-                '<%= request['service-data']['request-information']['order-number'] %>',
-                '<%= request['service-data']['request-information']['request-id'] %>',
-                '<%= request['service-data']['request-information']['order-version'] %>',
-                '<%= request['service-data']['request-information']['request-action'] %>',
-                '<%= request['service-data']['request-information']['request-sub-action'] %>');">request-information</a>
-			</td>
-			</tr>
-			<% i = i+1; %>
-		<% } %>
-		<% if ( typeof request['service-data']['sdnc-request-header'] != 'undefined' )
-		{ %>
-        	<tr class="treegrid-<%= i %> treegrid-parent-<%= service_data_node %>">
-			<td>
-			<a class=""
-               href="javascript:reqHeader(
-               '<%= request['service-data']['sdnc-request-header']['svc-notification-url'] %>',
-               '<%= request['service-data']['sdnc-request-header']['svc-request-id'] %>',
-               '<%= request['service-data']['sdnc-request-header']['svc-action'] %>');">sdnc-request-header</a>
-			</td>
-			</tr>
-			<% i = i+1; %>
-		<% } %>
-		<% if ( typeof request['service-data']['l2-homing-information'] != 'undefined' )
-    	{ %>
-        	<tr class="treegrid-<%= i %> treegrid-parent-<%= service_data_node %>">
-			<td>
-				<a class=""
-               	href="javascript:l2Homing(
-               	'<%= request['service-data']['l2-homing-information']['evc-name'] %>',
-               	'<%= request['service-data']['l2-homing-information']['preferred-aic-clli'] %>',
-               	'<%= request['service-data']['l2-homing-information']['topology'] %>');">l2-homing-information</a>
-			</td>
-			</tr>
-			<% i = i+1; %>
-		<% } %>
-		<% if ( typeof request['service-data']['service-information'] != 'undefined' )
-    	{ %>
-        	<tr class="treegrid-<%= i %> treegrid-parent-<%= service_data_node %>">
-			<td>
-				<a class=""
-               href="javascript:svcInfo(
-               '<%= request['service-data']['service-information']['service-instance-id'] %>',
-               '<%= request['service-data']['service-information']['subscriber-name'] %>',
-               '<%= request['service-data']['service-information']['service-type'] %>');">service-information</a>
-			</td>
-			</tr>
-			<% i++; %>
-		<% } %>
-		<% if ( typeof request['service-data']['feature-list'] != 'undefined' )
-        { %>
-			<% var feature_list_node = i; %>
-        	<tr class="treegrid-<%= i %> treegrid-parent-<%= service_data_node %>">
-			<td> feature-list</td>
-			</tr>
-            <% i++; %>
-
-        	<% request['service-data']['feature-list'].forEach(function(request) 
-			{ %>
-            	<tr class="treegrid-<%= i %> treegrid-parent-<%= feature_list_node %>">
-            	<td>
-                	<a class=""
-               			href="javascript:feature_list(
-               			'<%= request['feature-instance-id'] %>',
-               			'<%= request['feature-instance-xpath'] %>',
-               			'<%= request['feature-sub-type'] %>',
-               			'<%= request['feature-type'] %>');">feature-list</a>
-            	</td>
-            	</tr>
-            	<% i++; %>
-			<% }); %>
-        <% } %>
-		<% if ( typeof request['service-data']['svc-config-additional-data'] != 'undefined' )
-		{ %>
-			<% var svc_config_additional_data_node = i; %>
-        	<tr class="treegrid-<%= i %> treegrid-parent-<%= service_data_node %>">
-			<td> svc-config-additional-data</td>
-			</tr>
-            <% i++; %>
-
-			<tr class="treegrid-<%= i %> treegrid-parent-<%= svc_config_additional_data_node %>">
-            <td>
-            	<a class=""
-                	href="javascript:svc_config_additional_data(
-                    '<%= request['service-data']['svc-config-additional-data']['management-ip'] %>');">management-ip</a>
-            </td>
-            </tr>
-            <% i++; %>
-		<% } %>
-		<% if ( typeof request['service-data']['equipment'] != 'undefined' )
-        { %>
-			<% var equipment_node = i; %>
-        	<tr class="treegrid-<%= i %> treegrid-parent-<%= service_data_node %>">
-			<td> equipment</td>
-			</tr>
-            <% i++; %>
-
-        	<% request['service-data']['equipment'].forEach(function(equip) 
-			{ %>
-				<tr class="treegrid-<%= i %> treegrid-parent-<%= equipment_node %>">
-                <td>
-                    <a class=""
-                        href="javascript:equipment(
-                        '<%= equip['equipment-role'] %>',
-                        '<%= equip['ipv4-oam-address'] %>',
-                        '<%= equip['ipv4-oam-gateway-address-prefix-length'] %>',
-                        '<%= equip['ptnii-name'] %>',
-                        '<%= equip['v4-loopback0-ip-address'] %>',
-                        '<%= equip['ipv4-oam-gateway-address'] %>');">equipment</a>
-                </td>
-                </tr>
-                <% i++; %>
-
-				<% if ( typeof equip['ipv4-infrastructure-static-route'] != 'undefined' )
-                { %>
-                    <% ipv4_infrastructure_static_route_node = i; %>
-                    <tr class="treegrid-<%= i %> treegrid-parent-<%= equipment_node %>">
-                    <td> ipv4-infrastructure-static-route</td>
-                    </tr>
-                    <% i++; %>
-			
-					<% equip['ipv4-infrastructure-static-route'].forEach(function(eroute)
-                    { %>
-                        <tr class="treegrid-<%= i %> treegrid-parent-<%= ipv4_infrastructure_static_route_node %>">
-                        <td>
-                            <a class=""
-                                href="javascript:ipv4_infrastructure_static_route(
-                                '<%= eroute['ipv4-outgoing-interface'] %>',
-                                '<%= eroute['ipv4-next-hop-address'] %>',
-                                '<%= eroute['ipv4-dest-prefix'] %>',
-                                '<%= eroute['ipv4-dest-prefix-length'] %>');">ipv4_infrastructure_static_route</a>
-                        </td>
-                        </tr>
-                        <% i++; %>
-                    <% }); %>
-                <% } %>
-				<% if ( typeof equip['ipv6-infrastructure-static-route'] != 'undefined' )
-                { %>
-                    <% ipv6_infrastructure_static_route_node = i; %>
-                    <tr class="treegrid-<%= i %> treegrid-parent-<%= equipment_node %>">
-                    <td> ipv6-infrastructure-static-route</td>
-                    </tr>
-                    <% i++; %>
-
-                    <% equip['ipv6-infrastructure-static-route'].forEach(function(eroute)
-                    { %>
-                        <tr class="treegrid-<%= i %> treegrid-parent-<%= ipv6_infrastructure_static_route_node %>">
-                        <td>
-                            <a class=""
-                                href="javascript:ipv6_infrastructure_static_route(
-                                '<%= eroute['ipv6-outgoing-interface'] %>',
-                                '<%= eroute['ipv6-next-hop-address'] %>',
-                                '<%= eroute['ipv6-dest-prefix'] %>',
-                                '<%= eroute['ipv6-dest-prefix-length'] %>');">ipv6_infrastructure_static_route</a>
-                        </td>
-                        </tr>
-                        <% i++; %>
-                    <% }); %>
-                <% } %>
-				<% if ( typeof equip['interface'] != 'undefined' )
-                { %>
-                    <% interface_node = i; %>
-                    <tr class="treegrid-<%= i %> treegrid-parent-<%= equipment_node %>">
-                    <td> interface</td>
-                    </tr>
-                    <% i++; %>
-
-                    <% equip['interface'].forEach(function(interface)
-                    { %>
-                        <tr class="treegrid-<%= i %> treegrid-parent-<%= interface_node %>">
-                        <td>
-                            <a class=""
-                                href="javascript:interface(
-                                '<%= interface['interface-name'] %>',
-                                '<%= interface['interface-role'] %>');">interface</a>
-                        </td>
-                        </tr>
-                        <% i++; %>
-
-						<% if ( typeof interface['vlan'] != 'undefined' )
-                    	{ %>
-                    		<% vlan_node = i; %>
-                    		<tr class="treegrid-<%= i %> treegrid-parent-<%= interface_node %>">
-                    		<td> vlan</td>
-                    		</tr>
-                    		<% i++; %>
-
-                    		<% interface['vlan'].forEach(function(vlan)
-                    		{ %>
-                        		<tr class="treegrid-<%= i %> treegrid-parent-<%= vlan_node %>">
-                        		<td>
-                            		<a class=""
-                                		href="javascript:vlan(
-                                		'<%= vlan['vlan-interface'] %>',
-                                		'<%= vlan['vlan-id-outer'] %>',
-                                		'<%= vlan['vlan-id-inner'] %>');">vlan</a>
-                        		</td>
-                        		</tr>
-                        		<% i++; %>
-
-								<% if ( typeof vlan['l3-interface-ipv4-address-list'] != 'undefined' )
-                    			{ %>
-                    				<% ipv4_address_list_node = i; %>
-                    				<tr class="treegrid-<%= i %> treegrid-parent-<%= interface_node %>">
-                    				<td> l3-interface-ipv4-address-list</td>
-                    				</tr>
-                    				<% i++; %>
-
-                    				<% vlan['l3-interface-ipv4-address-list'].forEach(function(v4)
-                    				{ %>
-										<tr class="treegrid-<%= i %> treegrid-parent-<%= ipv4_address_list_node %>">
-                                		<td>
-                                    		<a class=""
-                                        		href="javascript:l3_interface_ipv4_address_list(
-                                        		'<%= v4['l3-interface-ipv4-address'] %>',
-                                        		'<%= v4['l3-interface-ipv4-prefix-length'] %>');">l3-interface-ipv4-address-list</a>
-                                		</td>
-                                		</tr>
-                                		<% i++; %>
-
-                    				<% }); %>
-                    			<% }; %>
-
-								<% if ( typeof vlan['l3-interface-ipv6-address-list'] != 'undefined' )
-                                { %>
-                                    <% ipv6_address_list_node = i; %>
-                                    <tr class="treegrid-<%= i %> treegrid-parent-<%= interface_node %>">
-                                    <td> l3-interface-ipv6-address-list</td>
-                                    </tr>
-                                    <% i++; %>
-
-                                    <% vlan['l3-interface-ipv6-address-list'].forEach(function(v6)
-                                    { %>
-										<tr class="treegrid-<%= i %> treegrid-parent-<%= ipv6_address_list_node %>">
-                                		<td>
-                                    		<a class=""
-                                        		href="javascript:l3_interface_ipv6_address_list(
-                                        		'<%= v6['l3-interface-ipv6-address'] %>',
-                                        		'<%= v6['l3-interface-ipv6-prefix-length'] %>');">l3-interface-ipv6-address-list</a>
-                                		</td>
-                                		</tr>
-                                		<% i++; %>
-                                    <% }); %>
-                                <% }; %>
-                    		<% }); %>
-                    	<% }; %>
-                	<% }); %>
-                <% } %>
-
-
-
-			<% }); %>
-		<% } %>
-
-		<% if ( typeof request['service-data']['l3sdn-vnf-fields'] != 'undefined' )
-		{ %>
-			<% l3sdn_vnf_fields_node = i; %>
-        	<tr class="treegrid-<%= i %> treegrid-parent-<%= service_data_node %>">
-			<td> l3sdn-vnf-fields</td>
-			</tr>
-			<% i++; %>
-
-			<tr class="treegrid-<%= i %> treegrid-parent-<%= l3sdn_vnf_fields_node %>">
-            	<td>
-            		<a class=""
-            		href="javascript:l3sdn_vnf_fields(
-            		'<%= request['service-data']['l3sdn-vnf-fields']['availability-zone'] %>',
-            		'<%= request['service-data']['l3sdn-vnf-fields']['vnf-stack-id'] %>',
-            		'<%= request['service-data']['l3sdn-vnf-fields']['vnf-name'] %>',
-            		'<%= request['service-data']['l3sdn-vnf-fields']['vnf-name2'] %>',
-            		'<%= request['service-data']['l3sdn-vnf-fields']['vnf-type'] %>',
-            		'<%= request['service-data']['l3sdn-vnf-fields']['vnf-status'] %>',
-            		'<%= request['service-data']['l3sdn-vnf-fields']['vnf-id'] %>',
-            		'<%= request['service-data']['l3sdn-vnf-fields']['oam-network-name'] %>',
-            		'<%= request['service-data']['l3sdn-vnf-fields']['aic_site_id'] %>');">l3sdn-vnf-fields</a>
-            	</td>
-            </tr>
-            <% i++; %>
-
-			<% if ( typeof request['service-data']['l3sdn-vnf-fields']['network-connections'] != 'undefined' )
-            { %>
-                <% network_connections_node = i; %>
-                <tr class="treegrid-<%= i %> treegrid-parent-<%= l3sdn_vnf_fields_node %>">
-                <td> network-connections</td>
-                </tr>
-                <% i++; %>
-
-                <% request['service-data']['l3sdn-vnf-fields']['network-connections'].forEach(function(nconn)
-                { %>
-                    <tr class="treegrid-<%= i %> treegrid-parent-<%= network_connections_node %>">
-                    <td>
-                        <a class=""
-                        href="javascript:network_connections(
-                        '<%= nconn['stack-id'] %>',
-                        '<%= nconn['net-status'] %>',
-                        '<%= nconn['connection-type'] %>',
-                        '<%= nconn['provider-network'] %>',
-                        '<%= nconn['interface-id'] %>',
-                        '<%= nconn['vlan'] %>',
-                        '<%= nconn['port-group-name'] %>',
-                        '<%= nconn['neutron-network-id'] %>');">network-connections</a>
-                    </td>
-                    </tr>
-                    <% i++; %>
-                <% }); %>
-            <% } %>
-
-			<% if ( typeof request['service-data']['l3sdn-vnf-fields']['vnf-vm-information'] != 'undefined' )
-            { %>
-                <% vnf_vm_information_node = i; %>
-                <tr class="treegrid-<%= i %> treegrid-parent-<%= l3sdn_vnf_fields_node %>">
-                <td> vnf-vm-information</td>
-                </tr>
-                <% i++; %>
-
-                <% request['service-data']['l3sdn-vnf-fields']['vnf-vm-information'].forEach(function(info)
-                { %>
-                    <tr class="treegrid-<%= i %> treegrid-parent-<%= vnf_vm_information_node %>">
-                    <td>
-                        <a class=""
-                        href="javascript:vnf_vm_information(
-                        '<%= info['vserver-type'] %>',
-                        '<%= info['vserver-name'] %>');">vnf-vm-information</a>
-                    </td>
-                    </tr>
-                    <% i++; %>
-                <% }); %>
-            <% } %>
-
-
-		<% } %>
-
-		<% if ( typeof request['service-data']['vr-lan'] != 'undefined' )
-		{ %>
-			<% if ( typeof request['service-instance-id'] != 'undefined' )
-			{ 
-    			var svc_instance_id = request['service-instance-id'];
-			} %>
-
-			<% vr_lan_node = i; %>
-        	<tr class="treegrid-<%= i %> treegrid-parent-<%= service_data_node %>">
-			<td> vr-lan</td>
-			</tr>
-			<% i++; %>
-			
-
-			<% if ( request['service-data']['vr-lan']['routing-protocol'] != 'undefined' )
-			{ %>
-				<tr class="treegrid-<%= i %> treegrid-parent-<%= vr_lan_node %>">
-				<td>
-            		<a href="javascript:routing_protocol('<%= svc_instance_id %>',
-					'<%= request['service-data']['vr-lan']['routing-protocol'] %>');">routing-protocol</a> 
-				</td>
-				</tr>
-				<% i++; %>
-			<% } %>
-			<% vr_lan_interface_node = i; %>
-        	<tr class="treegrid-<%= i %> treegrid-parent-<%= vr_lan_node %>">
-			<td> vr-lan-interface</td>
-			</tr>
-			<% i++; %>
-
-			<% if( typeof request['service-data']['vr-lan']['vr-lan-interface'] != 'undefined' )
-    		{ %>
-				
-        		<% request['service-data']['vr-lan']['vr-lan-interface'].forEach(function(request) 
-				{ %>
-
-        			<% if ( request['vr-designation'] != 'undefined')
-        			{
-            			var vr_designation = request['vr-designation'];
-        			} %>
-
-					<tr class="treegrid-<%= i %> treegrid-parent-<%= vr_lan_interface_node %>">
-        			<td>
-            			<a href="javascript:vrlan_interface(
-               			'<%= svc_instance_id %>',
-               			'<%= request['vr-designation'] %>',
-               			'<%= request['v6-vr-lan-prefix'] %>',
-               			'<%= request['v6-vr-lan-prefix-length'] %>',
-               			'<%= request['v6-vce-wan-address'] %>',
-               			'<%= request['v4-vr-lan-prefix-length'] %>',
-               			'<%= request['v4-vr-lan-prefix'] %>',
-               			'<%= request['t-defaulted-v6-vrlan'] %>',
-               			'<%= request['v4-vce-loopback-address'] %>');">vr-lan-interface</a>
-        			</td>
-        			</tr>
-        			<% i++; %>
-
-					<% if ( typeof request['dhcp'] != 'undefined' )
-        			{ %>
-            			<% var dhcp_node = i; %>
-            			<tr class="treegrid-<%= i %> treegrid-parent-<%= vr_lan_interface_node %>">
-            			<td> dhcp</td>
-            			</tr>
-            			<% i++; %>
-
-            			<tr class="treegrid-<%= i %> treegrid-parent-<%= dhcp_node %>">
-            			<td>
-                			<a href="javascript:dhcp(
-                   			'<%= svc_instance_id %>',
-                   			'<%= request['dhcp']['use-v4-default-pool'] %>',
-                   			'<%= request['dhcp']['use-v6-default-pool'] %>',
-                   			'<%= request['dhcp']['v4-dhcp-server-enabled'] %>',
-                   			'<%= request['dhcp']['v6-dhcp-server-enabled'] %>',
-                   			'<%= request['dhcp']['v6-dhcp-default-pool-prefix'] %>',
-                   			'<%= request['dhcp']['v6-dhcp-default-pool-prefix-length'] %>',
-                   			'<%= request['dhcp']['v4-dhcp-default-pool-prefix'] %>',
-                   			'<%= request['dhcp']['v4-dhcp-default-pool-prefix-length'] %>');">dhcp</a>
-            			</td>
-            			</tr>
-            			<% i++; %>
-
-						<% if ( typeof request['dhcp']['v4-dhcp-pools'] != 'undefined' )
-            			{ %>
-                			<% var v4_dhcp_pools_node = i; %>
-                			<tr class="treegrid-<%= i %> treegrid-parent-<%= dhcp_node %>">
-                			<td>v4-dhcp-pool</td>
-                			</tr>
-                			<% i++; %>
-
-                			<% request['dhcp']['v4-dhcp-pools'].forEach(function(v4request)
-                			{ %>
-                    			<tr class="treegrid-<%= i %> treegrid-parent-<%= v4_dhcp_pools_node %>">
-                    			<td>
-                        			<a href="javascript:v4_dhcp_pools(
-                        			'<%= svc_instance_id %>',
-                        			'<%= v4request['v4-dhcp-relay-next-hop-address'] %>',
-                        			'<%= v4request['v4-dhcp-pool-prefix'] %>',
-                        			'<%= v4request['v4-dhcp-pool-prefix-length'] %>',
-                        			'<%= v4request['v4-dhcp-relay-gateway-address'] %>');">v4-dhcp-pools</a>
-                    			</td>
-                    			</tr>
-                    			<% i++; %>
-
-                    			<% if ( typeof v4request['excluded-v4-address'] != 'undefined' )
-                    			{ %>
-                        			<% var excluded_v4_address_node = i; %>
-                        			<tr class="treegrid-<%= i %> treegrid-parent-<%= v4_dhcp_pools_node %>">
-                            			<td>exluded-v4-address</td>
-                        			</tr>
-                        			<% i++; %>
-
-                        			<% v4request['excluded-v4-addresses'].forEach(function(ex_request)
-                        			{ %>
-                            			<tr class="treegrid-<%= i %> treegrid-parent-<%= excluded_v4_address_node %>">
-                            			<td>
-                                			<a href="javascript:excluded_v4_address(
-                                			'<%= svc_instance_id %>',
-                                			'<%= ex_request['excluded-v4-address'] %>');">excluded-v4-address</a>
-                            			</td>
-                            			</tr>
-                            			<% i++; %>
-                        			<% }); %>
-                    			<% } %>
-                			<% }); %>
-            			<% } %>
-				
-						<% if ( typeof request['dhcp']['excluded-v4-dhcp-addresses-from-default-pool'] != 'undefined' )
-            			{ %>
-                			<% var exc_v4_address_node = i; %>
-                			<tr class="treegrid-<%= i %> treegrid-parent-<%= dhcp_node %>">
-                			<td>excluded-v4-dhcp-addresses-from-default-pool</td>
-                			</tr>
-                			<% i++; %>
-
-                			<% request['dhcp']['excluded-v4-dhcp-addresses-from-default-pool'].forEach(function(ex_request)
-                			{ %>
-                    			<tr class="treegrid-<%= i %> treegrid-parent-<%= exc_v4_address_node %>">
-                    			<td>
-                        			<a href="javascript:excluded_v4_addresses_from_default_pool(
-                        			'<%= svc_instance_id %>',
-                        			'<%= ex_request['excluded-v4-address'] %>');">excluded-v4-dhcp-addresses-from-default-pool</a>
-                    			</td>
-                    			</tr>
-                    			</tr>
-                    			<% i++; %>
-                			<% }); %>
-            			<% } %>
-						<% if ( typeof request['dhcp']['v6-dhcp-pools'] != 'undefined' )
-						{ %>
-                			<% var v6_dhcp_pools_node = i; %>
-                			<tr class="treegrid-<%= i %> treegrid-parent-<%= dhcp_node %>">
-                			<td>v6-dhcp-pool</td>
-                			</tr>
-                			<% i++; %>
-
-                			<% request['dhcp']['v6-dhcp-pools'].forEach(function(v6request)
-                			{ %>
-                    			<tr class="treegrid-<%= i %> treegrid-parent-<%= v6_dhcp_pools_node %>">
-                    			<td>
-                        			<a href="javascript:v6_dhcp_pools(
-                        			'<%= svc_instance_id %>',
-                        			'<%= v6request['v6-dhcp-relay-next-hop-address'] %>',
-                        			'<%= v6request['v6-dhcp-pool-prefix'] %>',
-                        			'<%= v6request['v6-dhcp-pool-prefix-length'] %>',
-                        			'<%= v6request['v6-dhcp-relay-gateway-address'] %>');">v6-dhcp-pools</a>
-                    			</td>
-                    			</tr>
-                    			<% i++; %>
-
-                    			<% if ( typeof v6request['excluded-v6-addresses'] != 'undefined' )
-                    			{ %>
-                        			<% var excluded_v6_address_node = i; %>
-                        			<tr class="treegrid-<%= i %> treegrid-parent-<%= v6_dhcp_pools_node %>">
-                            			<td>exluded-v6-address</td>
-                        			</tr>
-                        			<% i++; %>
-
-                        			<% v6request['excluded-v6-addresses'].forEach(function(ex_request)
-                        			{ %>
-                            			<tr class="treegrid-<%= i %> treegrid-parent-<%= excluded_v6_address_node %>">
-                            			<td>
-                                			<a href="javascript:excluded_v6_addresses(
-                                			'<%= svc_instance_id %>',
-                                			'<%= ex_request['excluded-v6-address'] %>');">excluded-v6-address</a>
-                            			</td>
-                            			</tr>
-                            			<% i++; %>
-                        			<% }); %>
-                    			<% } %>
-                			<% }); %>
-            			<% } %>
-						
-						<% if ( typeof request['dhcp']['excluded-v6-dhcp-addresses-from-default-pool'] != 'undefined' )
-            			{ %>
-                			<% var exc_v6_address_node = i; %>
-                			<tr class="treegrid-<%= i %> treegrid-parent-<%= dhcp_node %>">
-                			<td>excluded-v6-dhcp-addresses-from-default-pool</td>
-                			</tr>
-                			<% i++; %>
-
-                			<% request['dhcp']['excluded-v6-dhcp-addresses-from-default-pool'].forEach(function(ex_request)
-                			{ %>
-                    			<tr class="treegrid-<%= i %> treegrid-parent-<%= exc_v6_address_node %>">
-                    			<td>
-                        			<a href="javascript:excluded_v6_addresses_from_default_pool(
-                        			'<%= svc_instance_id %>',
-                        			'<%= ex_request['excluded-v6-address'] %>');">excluded-v6-dhcp-addresses-from-default-pool</a>
-                    			</td>
-                    			</tr>
-                    			</tr>
-                    			<% i++; %>
-                			<% }); %>
-            			<% } %>
-				<% } %>
-				<% if ( typeof request['firewall-lite'] != 'undefined' )
-                { %>
-                    <% var firewall_lite_node = i; %>
-                    <tr class="treegrid-<%= i %> treegrid-parent-<%= vr_lan_interface_node %>">
-                        <td> firewall-lite</td>
-                    </tr>
-                    <% i++; %>
-
-                    <tr class="treegrid-<%= i %> treegrid-parent-<%= firewall_lite_node %>">
-                    <td>
-                        <a href="javascript:firewall_lite(
-                        '<%= svc_instance_id %>',
-                        '<%= vr_designation %>',
-                        '<%= request['firewall-lite']['stateful-firewall-lite-v6-enabled'] %>',
-                        '<%= request['firewall-lite']['stateful-firewall-lite-v4-enabled'] %>');">firewall-lite</a>
-                    </td>
-                    </tr>
-                    <% i++; %>
-
-                    <% if ( typeof request['firewall-lite']['v6-firewall-packet-filters'] != 'undefined' )
-                    { %>
-                        <% var v6_firewall_packet_filters_node = i; %>
-                        <tr class="treegrid-<%= i %> treegrid-parent-<%= firewall_lite_node %>">
-                            <td>v6_firewall_packet_filters</td>
-                        </tr>
-                        <% i++; %>
-
-						<% request['firewall-lite']['v6-firewall-packet-filters'].forEach(function(v6request)
-                        { %>
-                            <tr class="treegrid-<%= i %> treegrid-parent-<%= v6_firewall_packet_filters_node %>">
-                            <td>
-                                <a href="javascript:v6_firewall_packet_filters(
-                                '<%= svc_instance_id %>',
-                                '<%= v6request['v6-firewall-prefix'] %>',
-                                '<%= v6request['v6-firewall-prefix-length'] %>',
-                                '<%= v6request['allow-icmp-ping'] %>');">v6-firewall-packet-filters</a>
-                            </td>
-                            </tr>
-                            <% i++; %>
-
-							<% if ( typeof v6request['udp-port-list'] != 'undefined' )
-                            { %>
-                                <% var udp_port_list_node = i; %>
-                                <tr class="treegrid-<%= i %> treegrid-parent-<%= v6_firewall_packet_filters_node %>">
-                                    <td>udp_port_list</td>
-                                </tr>
-                                <% i++; %>
-
-                                <% v6request['udp-port-list'].forEach(function(udp_request)
-                                { %>
-                                    <tr class="treegrid-<%= i %> treegrid-parent-<%= udp_port_list_node %>">
-                                    <td>
-                                        <a href="javascript:udp_port_list(
-                                        '<%= svc_instance_id %>',
-                                        '<%= udp_request['port-number'] %>');">udp-port-list</a>
-                                    </td>
-                                    </tr>
-                                    <% i++; %>
-                                <% }); %>
-                            <% } %>
-							<% if ( typeof v6request['tcp-port-list'] != 'undefined' )
-                            { %>
-                                <% var tcp_port_list_node = i; %>
-                                <tr class="treegrid-<%= i %> treegrid-parent-<%= v6_firewall_packet_filters_node %>">
-                                    <td>tcp_port_list</td>
-                                </tr>
-                                <% i++; %>
- 								<% v6request['tcp-port-list'].forEach(function(tcp_request)
-                                { %>
-                                    <tr class="treegrid-<%= i %> treegrid-parent-<%= tcp_port_list_node %>">
-                                    <td>
-                                        <a href="javascript:tcp_port_list(
-                                        '<%= svc_instance_id %>',
-                                        '<%= tcp_request['port-number'] %>');">tcp-port-list</a>
-                                    </td>
-                                    </tr>
-                                    <% i++; %>
-                                <% }); %>
-                            <% } %>
-						<% }); %>
-
-                    <% } %>
-					<% if ( typeof request['firewall-lite']['v4-firewall-packet-filters'] != 'undefined' )
-                 	{ %>
-                        <% var v4_firewall_packet_filters_node = i; %>
-                        <tr class="treegrid-<%= i %> treegrid-parent-<%= firewall_lite_node %>">
-                            <td>v4_firewall_packet_filters</td>
-                        </tr>
-                        <% i++; %>
-
-                        <% request['firewall-lite']['v4-firewall-packet-filters'].forEach(function(v4request)
-                        { %>
-                            <tr class="treegrid-<%= i %> treegrid-parent-<%= v4_firewall_packet_filters_node %>">
-                            <td>
-                                <a href="javascript:v4_firewall_packet_filters(
-                                '<%= svc_instance_id %>',
-                                '<%= v4request['v4-firewall-prefix'] %>',
-                                '<%= v4request['v4-firewall-prefix-length'] %>',
-                                '<%= v4request['allow-icmp-ping'] %>');">v4-firewall-packet-filters</a>
-                            </td>
-                            </tr>
-                            <% i++; %>
-
-                            <% if ( typeof v4request['udp-port-list'] != 'undefined' )
-                            { %>
-                                <% var udp_port_list_node = i; %>
-                                <tr class="treegrid-<%= i %> treegrid-parent-<%= v4_firewall_packet_filters_node %>">
-                                    <td>udp_port_list</td>
-                                </tr>
-                                <% i++; %>
-
-                                <% v4request['udp-port-list'].forEach(function(udp_request)
-                                { %>
-                                    <tr class="treegrid-<%= i %> treegrid-parent-<%= udp_port_list_node %>">
-                                    <td>
-                                        <a href="javascript:udp_port_list(
-                                        '<%= svc_instance_id %>',
-                                        '<%= udp_request['port-number'] %>');">udp-port-list</a>
-                                    </td>
-                                    </tr>
-                                    <% i++; %>
-                                <% }); %>
-                            <% } %>
-                            <% if ( typeof v4request['tcp-port-list'] != 'undefined' )
-                            { %>
-                                <% var tcp_port_list_node = i; %>
-                                <tr class="treegrid-<%= i %> treegrid-parent-<%= v4_firewall_packet_filters_node %>">
-                                    <td>tcp_port_list</td>
-                                </tr>
-                                <% i++; %>
-                                <% v4request['tcp-port-list'].forEach(function(tcp_request)
-                                { %>
-                                    <tr class="treegrid-<%= i %> treegrid-parent-<%= tcp_port_list_node %>">
-                                    <td>
-                                        <a href="javascript:tcp_port_list(
-                                        '<%= svc_instance_id %>',
-                                        '<%= tcp_request['port-number'] %>');">tcp-port-list</a>
-                                    </td>
-                                    </tr>
-                                    <% i++; %>
-                                <% }); %>
-                            <% } %>
-                        <% }); %>
-
-                    <% } %>
-
-                <% } %>
-
-
- 				<% if ( typeof request['v4-public-lan-prefixes'] != 'undefined')
-				{ %>
-					<% var v4_public_lan_prefixes_node = i; %>
-                    <tr class="treegrid-<%= i %> treegrid-parent-<%= vr_lan_interface_node %>">
-                    	<td> v4-public-lan-prefixes</td>
-                    </tr>
-                    <% i++; %>
-
-					<% if (typeof request['v4-public-lan-prefixes']['t-provided-v4-lan-public-prefixes'] != 'undefined')
-        			{ %>
-
-            			<% request['v4-public-lan-prefixes']['t-provided-v4-lan-public-prefixes'].forEach(function(trequest)
-						{ %>
-                			<tr class="treegrid-<%= i %> treegrid-parent-<%= v4_public_lan_prefixes_node %>">
-                			<td>
-                    			<a href="javascript:t_provided_v4_prefixes(
-                    			'<%= svc_instance_id %>',
-                    			'<%= trequest['request-index'] %>',
-                    			'<%= trequest['v4-lan-public-prefix-length'] %>',
-                    			'<%= trequest['v4-lan-public-prefix'] %>');">t-provided-v4-lan-public-prefixes</a>
-                			</td>
-                			</tr>
-                			<% i++; %>
-            			<% }); %>
-        			<% } %>
-				<% } %>
-				<% if ( typeof request['v6-public-lan-prefixes'] != 'undefined')
-                { %>
-                    <% var v6_public_lan_prefixes_node = i; %>
-                    <tr class="treegrid-<%= i %> treegrid-parent-<%= vr_lan_interface_node %>">
-                        <td> v6-public-lan-prefixes</td>
-                    </tr>
-                    <% i++; %>
-
-                    <% if (typeof request['v6-public-lan-prefixes']['t-provided-v6-lan-public-prefixes'] != 'undefined')
-                    { %>
-
-                        <% request['v6-public-lan-prefixes']['t-provided-v6-lan-public-prefixes'].forEach(function(trequest)
-                        { %>
-                            <tr class="treegrid-<%= i %> treegrid-parent-<%= v6_public_lan_prefixes_node %>">
-                            <td>
-                                <a href="javascript:t_provided_v6_prefixes(
-                                '<%= svc_instance_id %>',
-                                '<%= trequest['request-index'] %>',
-                                '<%= trequest['v6-lan-public-prefix-length'] %>',
-                                '<%= trequest['v6-lan-public-prefix'] %>');">t-provided-v6-lan-public-prefixes</a>
-                            </td>
-                            </tr>
-                            <% i++; %>
-                        <% }); %>
-                    <% } %>
-                <% } %>
-
-				<% if ( typeof request['nat'] != 'undefined' )
-        		{ %>
-            		<% var nat_node = i %>
-            		<tr class="treegrid-<%= i %> treegrid-parent-<%= vr_lan_interface_node %>">
-                		<td> nat</td>
-            		</tr>
-            		<% i++; %>
-
-            		<tr class="treegrid-<%= i %> treegrid-parent-<%= nat_node %>">
-            		<td>
-                		<a href="javascript:nat(
-                		'<%= svc_instance_id %>',
-                		'<%= request['nat']['v4-nat-enabled'] %>');">nat</a>
-            		</td>
-            		</tr>
-            		<% i++; %>
-
-            		<% if ( typeof request['nat']['v4-nat-mapping-entries'] != 'undefined' )
-            		{
-                		var nat_mapping_node = i %>
-                		<tr class="treegrid-<%= i %> treegrid-parent-<%= nat_node %>">
-                    		<td>v4-nat-mapping-entries</td>
-                		</tr>
-                		<% i++; %>
-		
-                		<% request['nat']['v4-nat-mapping-entries'].forEach(function(trequest)
-                		{ %>
-                			<tr class="treegrid-<%= i %> treegrid-parent-<%= nat_mapping_node %>">
-                				<td>
-                    				<a href="javascript:v4_nat_mapping_entries(
-                    				'<%= svc_instance_id %>',
-                    				'<%= trequest['v4-nat-external'] %>',
-                    				'<%= trequest['v4-nat-next-hop-address'] %>',
-                    				'<%= trequest['v4-nat-internal'] %>');">v4-nat-mapping-entries</a>
-                				</td>
-                			</tr>
-                			<% i++; %>
-                		<% }); %>
-            		<% } %>
-        		<% } %>
-
-				<% if ( typeof request['static-routes'] != 'undefined' )
-        		{ %>
-            		<% var static_route_node = i; %>
-            		<tr class="treegrid-<%= i %> treegrid-parent-<%= vr_lan_interface_node %>">
-            			<td> static-routes</td>
-            		</tr>
-            		<% i++; %>
-            		<% if ( typeof request['static-routes']['v6-static-routes'] != 'undefined' )
-            		{ %>
-                		<% v6_static_route = i %>
-                		<tr class="treegrid-<%= i %> treegrid-parent-<%= static_route_node %>">
-                				<td>v6-static-routes</td>
-                		</tr>
-                		<% i++; %>
-
-                		<% request['static-routes']['v6-static-routes'].forEach(function(strequest){ %>
-                    		<tr class="treegrid-<%= i %> treegrid-parent-<%= v6_static_route %>">
-                    		<td>
-                        		<a href="javascript:v6_static_routes(
-                        		'<%= svc_instance_id %>',
-                        		'<%= strequest['v6-static-route-prefix'] %>',
-                        		'<%= strequest['v6-next-hop-address'] %>',
-                        		'<%= strequest['v6-static-route-prefix-length'] %>');">v6-static-routes</a>
-                    		</td>
-                    		</tr>
-                    		<% i++; %>
-                		<% }); %>
-            		<% } %>
-            		<% if ( typeof request['static-routes']['v4-static-routes'] != 'undefined' )
-            		{ %>
-                		<% v4_static_route = i %>
-                		<tr class="treegrid-<%= i %> treegrid-parent-<%= static_route_node %>">
-                		<td> v4-static-routes</td>
-                		</tr>
-                		<% i++; %>
-                		<% request['static-routes']['v4-static-routes'].forEach(function(v4request)
-                		{ %>
-                    		<tr class="treegrid-<%= i %> treegrid-parent-<%= v4_static_route %>">
-                    		<td>
-                        		<a href="javascript:v4_static_routes(
-                        		'<%= svc_instance_id %>',
-                        		'<%= v4request['v4-static-route-prefix'] %>',
-                        		'<%= v4request['v4-next-hop-address'] %>',
-                        		'<%= v4request['v4-static-route-prefix-length'] %>');">v4-static-routes</a>
-                    		</td>
-                    		</tr>
-                    		<% i++; %>
-                		<% }); %>
-            		<% } %>
-        		<% } %>
-
-				<% if ( typeof request['pat'] != 'undefined' )
-        		{ %>
-            		<% var pat_node = i %>
-            		<tr class="treegrid-<%= i %> treegrid-parent-<%= vr_lan_interface_node %>">
-                		<td> pat</td>
-            		</tr>
-            		<% i++; %>
-
-            		<tr class="treegrid-<%= i %> treegrid-parent-<%= pat_node %>">
-            			<td>
-                			<a href="javascript:pat(
-                			'<%= svc_instance_id %>',
-                			'<%= request['pat']['v4-pat-default-pool-prefix-length'] %>',
-                			'<%= request['pat']['use-v4-default-pool'] %>',
-                			'<%= request['pat']['v4-pat-enabled'] %>',
-                			'<%= request['pat']['v4-pat-default-pool-prefix'] %>');">pat</a>
-            			</td>
-            		</tr>
-	            	<% i++; %>
-
-            		<% if ( typeof request['pat']['v4-pat-pools'] != 'undefined' )
-            		{ %>
-                		<% var pat_pools_node = i %>
-                		<tr class="treegrid-<%= i %> treegrid-parent-<%= pat_node %>">
-                    		<td> v4-pat-pools</td>
-                		</tr>
-                		<% i++; %>
-
-                		<% request['pat']['v4-pat-pools'].forEach(function(trequest)
-                		{ %>
-                			<tr class="treegrid-<%= i %> treegrid-parent-<%= pat_pools_node %>">
-                			<td>
-                    			<a href="javascript:pat_pools(
-                    			'<%= svc_instance_id %>',
-                    			'<%= trequest['v4-pat-pool-next-hop-address'] %>',
-                    			'<%= trequest['v4-pat-pool-prefix-length'] %>',
-                    			'<%= trequest['v4-pat-pool-prefix'] %>');">v4-pat-pools</a>
-                			</td>
-                			</tr>
-                			<% i++; %>
-                		<% }); %>
-            	<% } %>
-        	<% } %>
-
-
-
-
-
-
-				<% }); %>
-			<% } %>
-		<% } %>
-
-	<% } %>
-	<% }); %> 
-</table>
-</div>
-</div>
-
-<div class="container-fluid">
-    <div class="row">
-    <div class="col-md-1 text-left">
-        <p>&nbsp;&nbsp;Page <%= pageInfo.currentPage %> of <%= pageInfo.pageCount %></p>
-    </div>
-    <div class="col-md-11 text-left">
-    <% if (pageInfo.pageCount > 1) { %>
-        <ul class="pagination">
-        <% if (pageInfo.currentPage > 1) { %>
-            <li><a href="/odl/pageWklst?page=1">&laquo;</a></li>
-        <% } %>
-        <% var i = 1;
-        if (pageInfo.currentPage > 10) {
-            i = +pageInfo.currentPage - 9;
-        } %>
-        <% if (i !== 1) { %>
-            <!--<li class="disabled"><a href="#">...</a></li>-->
-        <% } %>
-        <% for (i; i<=pageInfo.pageCount; i++) { %>
-            <% if (pageInfo.currentPage == i) { %>
-                <li class="active"><span><%= i %> <span class="sr-only">(current)</span></span></li>
-            <% } else { %>
-                <li><a href="/odl/pageWklst?page=<%= i %>"><%= i %></a></li>
-            <% } %>
-            <% if (i == (+pageInfo.currentPage + 9)) { %>
-                <!--<li class="disabled"><a href="#">...</a></li>-->
-            <% break; } %>
-        <% } %>
-        <% if (pageInfo.currentPage != pageInfo.pageCount) { %>
-            <li><a href="/odl/pageWklst?page=<%= pageInfo.pageCount %>">&raquo;</a></li>
-        <% } %>
-        </ul>
-    <% } %>
-    </div><!-- col-md-10 -->
-    </div><!-- row -->
-    </div><!-- container-fluid -->
-
-
-
-<% include ../partials/vnf_vm_information %>
-<% include ../partials/network_connections %>
-<% include ../partials/l3sdn_vnf_fields %>
-<% include ../partials/l3_interface_ipv4_address_list %>
-<% include ../partials/l3_interface_ipv6_address_list %>
-<% include ../partials/vlan %>
-<% include ../partials/interface %>
-<% include ../partials/ipv6_infrastructure_static_route %>
-<% include ../partials/ipv4_infrastructure_static_route %>
-<% include ../partials/equipment %>
-<% include ../partials/svc_config_additional_data %>
-<% include ../partials/feature_list %>
-<% include ../partials/pat %>
-<% include ../partials/pat_pools %>
-<% include ../partials/v6_static_routes %>
-<% include ../partials/v4_static_routes %>
-<% include ../partials/nat %>
-<% include ../partials/v4_nat_mapping_entries %>
-<% include ../partials/t_provided_v4_lan_public_prefixes %>
-<% include ../partials/v4_firewall_packet_filters %>
-<% include ../partials/udp_port_list %>
-<% include ../partials/tcp_port_list %>
-<% include ../partials/v6_firewall_packet_filters %>
-<% include ../partials/firewall_lite %>
-<% include ../partials/excluded_v6_addresses %>
-<% include ../partials/excluded_v6_address_from_default_pool %>
-<% include ../partials/v6_dhcp_pools %>
-<% include ../partials/excluded_v4_address_from_default_pool %>
-<% include ../partials/excluded_v4_address %>
-<% include ../partials/v4_dhcp_pools %>
-<% include ../partials/dhcp %>
-<% include ../partials/routing_protocol %>
-<% include ../partials/t_provided_v6_lan_public_prefixes %>
-<% include ../partials/vr_lan_interface %>
-<% include ../partials/service_information_modal %>
-<% include ../partials/l2_homing_information_modal %>
-<% include ../partials/sdnc_request_header_modal %>
-<% include ../partials/request_information_modal %>
-<% include ../partials/svc_topology_additional_data_modal %>
-<% include ../partials/service_status_modal %>
-<% include ../partials/oper_status_modal %>
-<% include ../partials/internet_evc_modal %>
-
-<footer>
-<% include ../partials/footer %>
-</footer>
-    
-<script type="text/javascript">
-
-
-
-function vnf_vm_information(vserver_type,vserver_name)
-{
-	var lvalue = document.getElementById('vserver_type');
-    if( vserver_type != 'undefined' ){
-        lvalue.value=vserver_type;
-    } else {
-        lvalue.value='';
-    }
-	lvalue = document.getElementById('vserver_name');
-    if( vserver_name != 'undefined' ){
-        lvalue.value=vserver_name;
-    } else {
-        lvalue.value='';
-    }
-    $('#vnf-vm-information-modal').modal('show');
-}
-function network_connections (stack_id,net_status,connection_type,provider_network,interface_id,vlan,port_group_name,neutron_network_id)
-{
-	var lvalue = document.getElementById('stack_id');
-    if( stack_id != 'undefined' ){
-        lvalue.value=stack_id;
-    } else {
-        lvalue.value='';
-    }
-	lvalue = document.getElementById('net_status');
-    if( net_status != 'undefined' ){
-        lvalue.value=net_status;
-    } else {
-        lvalue.value='';
-    }
-	lvalue = document.getElementById('connection_type');
-    if( connection_type != 'undefined' ){
-        lvalue.value=connection_type;
-    } else {
-        lvalue.value='';
-    }
-	lvalue = document.getElementById('provider_network');
-    if( provider_network != 'undefined' ){
-        lvalue.value=provider_network;
-    } else {
-        lvalue.value='';
-    }
-	lvalue = document.getElementById('interface_id');
-    if( interface_id != 'undefined' ){
-        lvalue.value=interface_id;
-    } else {
-        lvalue.value='';
-    }
-	lvalue = document.getElementById('vlan');
-    if( vlan != 'undefined' ){
-        lvalue.value=vlan;
-    } else {
-        lvalue.value='';
-    }
-	lvalue = document.getElementById('port_group_name');
-    if( port_group_name != 'undefined' ){
-        lvalue.value=port_group_name;
-    } else {
-        lvalue.value='';
-    }
-	lvalue = document.getElementById('neutron_network_id');
-    if( neutron_network_id != 'undefined' ){
-        lvalue.value=neutron_network_id;
-    } else {
-        lvalue.value='';
-    }
-    $('#network-connections-modal').modal('show');
-}
-
-function l3sdn_vnf_fields(availability_zone,vnf_stack_id,vnf_name,vnf_name2,vnf_type,vnf_status,vnf_id,oam_network_name,aic_site_id)
-{
-    var lvalue = document.getElementById('availability_zone');
-    if( availability_zone != 'undefined' ){
-        lvalue.value=availability_zone;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('vnf_stack_id');
-    if( vnf_stack_id != 'undefined' ){
-        lvalue.value=vnf_stack_id;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('vnf_name');
-    if( vnf_name != 'undefined' ){
-        lvalue.value=vnf_name;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('vnf_name2');
-    if( vnf_name2 != 'undefined' ){
-        lvalue.value=vnf_name2;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('vnf_type');
-    if( vnf_type != 'undefined' ){
-        lvalue.value=vnf_type;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('vnf_status');
-    if( vnf_status != 'undefined' ){
-        lvalue.value=vnf_status;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('vnf_id');
-    if( vnf_id != 'undefined' ){
-        lvalue.value=vnf_id;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('oam_network_name');
-    if( oam_network_name != 'undefined' ){
-        lvalue.value=oam_network_name;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('aic_site_id');
-    if( aic_site_id != 'undefined' ){
-        lvalue.value=aic_site_id;
-    } else {
-        lvalue.value='';
-    }
-    $('#l3sdn-vnf-fields-modal').modal('show');
-}
-function l3_interface_ipv4_address_list(l3_interface_ipv4_address,l3_interface_ipv4_prefix_length)
-{
-    var lvalue = document.getElementById('l3_interface_ipv4_address');
-    if( l3_interface_ipv4_address != 'undefined' ){
-        lvalue.value=l3_interface_ipv4_address;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('l3_interface_ipv4_prefix_length');
-    if( l3_interface_ipv4_prefix_length != 'undefined' ){
-        lvalue.value=l3_interface_ipv4_prefix_length;
-    } else {
-        lvalue.value='';
-    }
-    $('#l3-interface-ipv4-address-list-modal').modal('show');
-}
-
-function l3_interface_ipv6_address_list(l3_interface_ipv6_address,l3_interface_ipv6_prefix_length)
-{
-    var lvalue = document.getElementById('l3_interface_ipv6_address');
-    if( l3_interface_ipv6_address != 'undefined' ){
-        lvalue.value=l3_interface_ipv6_address;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('l3_interface_ipv6_prefix_length');
-    if( l3_interface_ipv6_prefix_length != 'undefined' ){
-        lvalue.value=l3_interface_ipv6_prefix_length;
-    } else {
-        lvalue.value='';
-    }
-    $('#l3-interface-ipv6-address-list-modal').modal('show');
-}
-
-
-function vlan(vlan_interface,vlan_id_inner,vlan_id_outer)
-{
-    var lvalue = document.getElementById('vlan_interface');
-    if( vlan_interface != 'undefined' ){
-        lvalue.value=vlan_interface;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('vlan_id_inner');
-    if( vlan_id_inner != 'undefined' ){
-        lvalue.value=vlan_id_inner;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('vlan_id_outer');
-    if( vlan_id_outer != 'undefined' ){
-        lvalue.value=vlan_id_outer;
-    } else {
-        lvalue.value='';
-    }
-    $('#vlan-modal').modal('show');
-}
-
-function interface(interface_name,interface_role)
-{
-    var lvalue = document.getElementById('interface_name');
-    if( interface_name != 'undefined' ){
-        lvalue.value=interface_name;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('interface_role');
-    if( interface_role != 'undefined' ){
-        lvalue.value=interface_role;
-    } else {
-        lvalue.value='';
-    }
-    $('#interface-modal').modal('show');
-}
-
-function ipv4_infrastructure_static_route(ipv4_outgoing_interface,ipv4_next_hop_address,ipv4_dest_prefix,ipv4_dest_prefix_length)
-{
-    var lvalue = document.getElementById('ipv4_outgoing_interface');
-    if( ipv4_outgoing_interface != 'undefined' ){
-        lvalue.value=ipv4_outgoing_interface;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('ipv4_next_hop_address');
-    if( ipv4_next_hop_address != 'undefined' ){
-        lvalue.value=ipv4_next_hop_address;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('ipv4_dest_prefix');
-    if( ipv4_dest_prefix != 'undefined' ){
-        lvalue.value=ipv4_dest_prefix;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('ipv4_dest_prefix_length');
-    if( ipv4_dest_prefix_length != 'undefined' ){
-        lvalue.value=ipv4_dest_prefix_length;
-    } else {
-        lvalue.value='';
-    }
-    $('#ipv4-infrastructure-static-route-modal').modal('show');
-}
-
-function ipv6_infrastructure_static_route(ipv6_outgoing_interface,ipv6_next_hop_address,ipv6_dest_prefix,ipv6_dest_prefix_length)
-{
-    var lvalue = document.getElementById('ipv6_outgoing_interface');
-    if( ipv6_outgoing_interface != 'undefined' ){
-        lvalue.value=ipv6_outgoing_interface;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('ipv6_next_hop_address');
-    if( ipv6_next_hop_address != 'undefined' ){
-        lvalue.value=ipv6_next_hop_address;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('ipv6_dest_prefix');
-    if( ipv6_dest_prefix != 'undefined' ){
-        lvalue.value=ipv6_dest_prefix;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('ipv6_dest_prefix_length');
-    if( ipv6_dest_prefix_length != 'undefined' ){
-        lvalue.value=ipv6_dest_prefix_length;
-    } else {
-        lvalue.value='';
-    }
-    $('#ipv6-infrastructure-static-route-modal').modal('show');
-}
-
-function equipment(equipment_role,ipv4_oam_address,ipv4_oam_gateway_address_prefix_length,ptnii_name,v4_loopback0_ip_address,ipv4_oam_gateway_address)
-{
-    var lvalue = document.getElementById('equipment_role');
-    if( equipment_role != 'undefined' ){
-        lvalue.value=equipment_role;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('ipv4_oam_address');
-    if( ipv4_oam_address != 'undefined' ){
-        lvalue.value=ipv4_oam_address;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('ipv4_oam_gateway_address_prefix_length');
-    if( ipv4_oam_gateway_address_prefix_length != 'undefined' ){
-        lvalue.value=ipv4_oam_gateway_address_prefix_length;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('ptnii_name');
-    if( ptnii_name != 'undefined' ){
-        lvalue.value=ptnii_name;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v4_loopback0_ip_address');
-    if( v4_loopback0_ip_address != 'undefined' ){
-        lvalue.value=v4_loopback0_ip_address;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('ipv4_oam_gateway_address');
-    if( ipv4_oam_gateway_address != 'undefined' ){
-        lvalue.value=ipv4_oam_gateway_address;
-    } else {
-        lvalue.value='';
-    }
-    $('#equipment-modal').modal('show');
-}
-function svc_config_additional_data(management_ip)
-{
-    var lvalue = document.getElementById('management_ip');
-    if( management_ip != 'undefined' ){
-        lvalue.value=management_ip;
-    } else {
-        lvalue.value='';
-    }
-    $('#svc-config-additional-data-modal').modal('show');
-}
-function feature_list(feature_instance_id,feature_instance_xpath,feature_sub_type,feature_type)
-{
-    var lvalue = document.getElementById('feature_instance_id');
-    if( feature_instance_id != 'undefined' ){
-        lvalue.value=feature_instance_id;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('feature_instance_xpath');
-    if( feature_instance_xpath != 'undefined' ){
-        lvalue.value=feature_instance_xpath;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('feature_sub_type');
-    if( feature_sub_type != 'undefined' ){
-        lvalue.value=feature_sub_type;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('feature_type');
-    if( feature_type != 'undefined' ){
-        lvalue.value=feature_type;
-    } else {
-        lvalue.value='';
-    }
-    $('#feature-list-modal').modal('show');
-}
-function pat_pools(svc_instance_id,v4_pat_pool_next_hop_address,v4_pat_pool_prefix_length,v4_pat_pool_prefix)
-{
-    document.getElementById('svc_instance_id').value = svc_instance_id;
-    var lvalue = document.getElementById('v4_pat_pool_next_hop_address');
-    if( v4_pat_pool_next_hop_address != 'undefined' ){
-        lvalue.value=v4_pat_pool_next_hop_address;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v4_pat_pool_prefix_length');
-    if( v4_pat_pool_prefix_length != 'undefined' ){
-        lvalue.value=v4_pat_pool_prefix_length;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v4_pat_pool_prefix');
-    if( v4_pat_pool_prefix != 'undefined' ){
-        lvalue.value=v4_pat_pool_prefix;
-    } else {
-        lvalue.value='';
-    }
-    $('#pat-pools-modal').modal('show');
-}
-function pat(svc_instance_id,v4_pat_default_pool_prefix_length,use_v4_default_pool,v4_pat_enabled,v4_pat_default_pool_prefix)
-{
-    document.getElementById('svc_instance_id').value = svc_instance_id;
-    var lvalue = document.getElementById('v4_pat_default_pool_prefix_length');
-    if( v4_pat_default_pool_prefix_length != 'undefined' ){
-        lvalue.value=v4_pat_default_pool_prefix_length;
-    } else {
-        lvalue.value='';
-    }
-
-    lvalue = document.getElementById('use_v4_default_pool');
-    if( use_v4_default_pool != 'undefined' ){
-        lvalue.value = use_v4_default_pool;
-    } else {
-        lvalue.value = '';
-    }
-
-    lvalue = document.getElementById('v4_pat_enabled');
-    if( v4_pat_enabled != 'undefined' ){
-        lvalue.value = v4_pat_enabled;
-    } else {
-        lvalue.value = '';
-    }
-
-    lvalue = document.getElementById('v4_pat_default_pool_prefix');
-    if( v4_pat_default_pool_prefix != 'undefined' ){
-        lvalue.value = v4_pat_default_pool_prefix;
-    } else {
-        lvalue.value = '';
-    }
-    $('#pat-modal').modal('show');
-}
-
-function v4_static_routes(svc_instance_id,v4_static_route_prefix,static_v4_next_hop_address,v4_static_route_prefix_length)
-{
-    document.getElementById('svc_instance_id').value = svc_instance_id;
-    var lvalue = document.getElementById('v4_static_route_prefix');
-    if( v4_static_route_prefix != 'undefined' ){
-        lvalue.value=v4_static_route_prefix;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('static_v4_next_hop_address');
-    if( static_v4_next_hop_address != 'undefined' ){
-        lvalue.value=static_v4_next_hop_address;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v4_static_route_prefix_length');
-    if( v4_static_route_prefix_length != 'undefined' ){
-        lvalue.value=v4_static_route_prefix_length;
-    } else {
-        lvalue.value='';
-    }
-    $('#v4-static-routes-modal').modal('show');
-}
-
-function v6_static_routes(svc_instance_id,v6_static_route_prefix,static_v6_next_hop_address,v6_static_route_prefix_length)
-{
-    document.getElementById('svc_instance_id').value = svc_instance_id;
-    var lvalue = document.getElementById('v6_static_route_prefix');
-    if( v6_static_route_prefix != 'undefined' ){
-        lvalue.value=v6_static_route_prefix;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('static_v6_next_hop_address');
-    if( static_v6_next_hop_address != 'undefined' ){
-        lvalue.value=static_v6_next_hop_address;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v6_static_route_prefix_length');
-    if( v6_static_route_prefix_length != 'undefined' ){
-        lvalue.value=v6_static_route_prefix_length;
-    } else {
-        lvalue.value='';
-    }
-    $('#v6-static-routes-modal').modal('show');
-}
-
-function nat(svc_instance_id,v4_nat_enabled) {
-    document.getElementById('svc_instance_id').value = svc_instance_id;
-    var lvalue = document.getElementById('v4_nat_enabled');
-    if( v4_nat_enabled != 'undefined' ){
-        lvalue.value=v4_nat_enabled;
-    } else {
-        lvalue.value='';
-    }
-    $('#nat-modal').modal('show');
-}
-function v4_nat_mapping_entries(svc_instance_id,v4_nat_external,v4_nat_next_hop_address,v4_nat_internal)
-{
-    document.getElementById('svc_instance_id').value = svc_instance_id;
-    var lvalue = document.getElementById('v4_nat_external');
-    if( v4_nat_external != 'undefined' ){
-        lvalue.value=v4_nat_external;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v4_nat_next_hop_address');
-    if( v4_nat_next_hop_address != 'undefined' ){
-        lvalue.value=v4_nat_next_hop_address;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v4_nat_internal');
-    if( v4_nat_internal != 'undefined' ){
-        lvalue.value=v4_nat_internal;
-    } else {
-        lvalue.value='';
-    }
-    $('#v4-nat-mapping-entries-modal').modal('show');
-}
-
-function v4_firewall_packet_filters(svc_instance_id,v4_firewall_prefix,v4_firewall_prefix_length,v4_allow_icmp_ping)
-{
-    document.getElementById('svc_instance_id').value = svc_instance_id;
-    var lvalue = document.getElementById('v4_firewall_prefix');
-    if( v4_firewall_prefix != 'undefined' ){
-        lvalue.value=v4_firewall_prefix;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v4_firewall_prefix_length');
-    if( v4_firewall_prefix_length != 'undefined' ){
-        lvalue.value=v4_firewall_prefix_length;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v4_allow_icmp_ping');
-    if( v4_allow_icmp_ping != 'undefined' ){
-        lvalue.value=v4_allow_icmp_ping;
-    } else {
-        lvalue.value='';
-    }
-    $('#v4-firewall-packet-filters-modal').modal('show');
-}
-
-function v6_firewall_packet_filters(svc_instance_id,v6_firewall_prefix,v6_firewall_prefix_length,v6_allow_icmp_ping)
-{
-    document.getElementById('svc_instance_id').value = svc_instance_id;
-    var lvalue = document.getElementById('v6_firewall_prefix');
-    if( v6_firewall_prefix != 'undefined' ){
-        lvalue.value=v6_firewall_prefix;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v6_firewall_prefix_length');
-    if( v6_firewall_prefix_length != 'undefined' ){
-        lvalue.value=v6_firewall_prefix_length;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v6_allow_icmp_ping');
-    if( v6_allow_icmp_ping != 'undefined' ){
-        lvalue.value=v6_allow_icmp_ping;
-    } else {
-        lvalue.value='';
-    }
-    $('#v6-firewall-packet-filters-modal').modal('show');
-}
-
-function tcp_port_list(svc_instance_id,tcp_port_number)
-{
-    document.getElementById('svc_instance_id').value = svc_instance_id;
-    var lvalue = document.getElementById('tcp_port_number');
-    if( tcp_port_number != 'undefined' ){
-        lvalue.value=tcp_port_number;
-    } else {
-        lvalue.value='';
-    }
-    $('#tcp-port-list-modal').modal('show');
-}
-function udp_port_list(svc_instance_id,udp_port_number)
-{
-    document.getElementById('svc_instance_id').value = svc_instance_id;
-    var lvalue = document.getElementById('udp_port_number');
-    if( udp_port_number != 'undefined' ){
-        lvalue.value=udp_port_number;
-    } else {
-        lvalue.value='';
-    }
-    $('#udp-port-list-modal').modal('show');
-}
-
-function firewall_lite(svc_instance_id,firewall_lite_vr_designation,stateful_firewall_lite_v4_enabled,stateful_firewall_lite_v6_enabled)
-{
-    document.getElementById('svc_instance_id').value = svc_instance_id;
-    document.getElementById('firewall_lite_vr_designation').value = firewall_lite_vr_designation;
-    var lvalue = document.getElementById('stateful_firewall_lite_v4_enabled');
-    if( stateful_firewall_lite_v4_enabled != 'undefined' ){
-        lvalue.value=stateful_firewall_lite_v4_enabled;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('stateful_firewall_lite_v6_enabled');
-    if( stateful_firewall_lite_v6_enabled != 'undefined' ){
-        lvalue.value=stateful_firewall_lite_v6_enabled;
-    } else {
-        lvalue.value='';
-    }
-    $('#firewall-lite-modal').modal('show');
-}
-
-function excluded_v6_addresses(svc_instance_id, excluded_v6_address)
-{
-    document.getElementById('svc_instance_id').value = svc_instance_id;
-    var lvalue = document.getElementById('excluded_v6_address');
-    if( excluded_v6_address != 'undefined' ){
-        lvalue.value=excluded_v6_address;
-    } else {
-        lvalue.value='';
-    }
-    $('#excluded-v6-addresses-modal').modal('show');
-}
-
-
-function excluded_v6_addresses_from_default_pool(svc_instance_id, excluded_v6_address_from_default_pool)
-{
-    document.getElementById('svc_instance_id').value = svc_instance_id;
-    var lvalue = document.getElementById('excluded_v6_address_from_default_pool');
-    if( excluded_v6_address_from_default_pool != 'undefined' ){
-        lvalue.value=excluded_v6_address_from_default_pool;
-    } else {
-        lvalue.value='';
-    }
-    $('#excluded-v6-address-from-default-pool-modal').modal('show');
-}
-
-
-function v6_dhcp_pools(svc_instance_id,v6_dhcp_relay_next_hop_address,v6_dhcp_pool_prefix,v6_dhcp_pool_prefix_length,v6_dhcp_relay_gateway_address)
-{
-    document.getElementById('svc_instance_id').value = svc_instance_id;
-    var lvalue = document.getElementById('v6_dhcp_relay_next_hop_address');
-    if( v6_dhcp_relay_next_hop_address != 'undefined' ){
-        lvalue.value=v6_dhcp_relay_next_hop_address;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v6_dhcp_pool_prefix');
-    if( v6_dhcp_pool_prefix != 'undefined' ){
-        lvalue.value=v6_dhcp_pool_prefix;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v6_dhcp_pool_prefix_length');
-    if( v6_dhcp_pool_prefix_length != 'undefined' ){
-        lvalue.value=v6_dhcp_pool_prefix_length;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v6_dhcp_relay_gateway_address');
-    if( v6_dhcp_relay_gateway_address != 'undefined' ){
-        lvalue.value=v6_dhcp_relay_gateway_address;
-    } else {
-        lvalue.value='';
-    }
-    $('#v6-dhcp-pools-modal').modal('show');
-}
-
-function excluded_v4_addresses_from_default_pool(svc_instance_id, excluded_v4_address)
-{
-    document.getElementById('svc_instance_id').value = svc_instance_id;
-    var lvalue = document.getElementById('excluded_v4_address_from_default_pool');
-    if( excluded_v4_address != 'undefined' ){
-        lvalue.value=excluded_v4_address;
-    } else {
-        lvalue.value='';
-    }
-    $('#excluded-v4-address-from-default-pool-modal').modal('show');
-}
-
-
-function exluded_v4_address(svc_instance_id, excluded_v4_address)
-{
-    document.getElementById('svc_instance_id').value = svc_instance_id;
-    var lvalue = document.getElementById('excluded_v4_address');
-    if( excluded_v4_address != 'undefined' ){
-        lvalue.value=excluded_v4_address;
-    } else {
-        lvalue.value='';
-    }
-    $('#excluded-v4-address-modal').modal('show');
-}
-
-function v4_dhcp_pools(svc_instance_id,v4_dhcp_relay_next_hop_address,v4_dhcp_pool_prefix,v4_dhcp_pool_prefix_length,v4_dhcp_relay_gateway_address)
-{
-    document.getElementById('svc_instance_id').value = svc_instance_id;
-    var lvalue = document.getElementById('v4_dhcp_relay_next_hop_address');
-    if( v4_dhcp_relay_next_hop_address != 'undefined' ){
-        lvalue.value=v4_dhcp_relay_next_hop_address;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v4_dhcp_pool_prefix');
-    if( v4_dhcp_pool_prefix != 'undefined' ){
-        lvalue.value=v4_dhcp_pool_prefix;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v4_dhcp_pool_prefix_length');
-    if( v4_dhcp_pool_prefix_length != 'undefined' ){
-        lvalue.value=v4_dhcp_pool_prefix_length;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v4_dhcp_relay_gateway_address');
-    if( v4_dhcp_relay_gateway_address != 'undefined' ){
-        lvalue.value=v4_dhcp_relay_gateway_address;
-    } else {
-        lvalue.value='';
-    }
-    $('#v4-dhcp-pools-modal').modal('show');
-}
-
-function dhcp(svc_instance_id,use_v4_default_pool,use_v6_default_pool,v4_dhcp_server_enabled,v6_dhcp_server_enabled,v6_dhcp_default_pool_prefix,v6_dhcp_default_pool_prefix_length,v4_dhcp_default_pool_prefix,v4_dhcp_default_pool_prefix_length)
-{
-    document.getElementById('svc_instance_id').value = svc_instance_id;
-    var lvalue = document.getElementById('use_v4_default_pool');
-    if( use_v4_default_pool != 'undefined' ){
-        lvalue.value=use_v4_default_pool;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('use_v6_default_pool');
-    if( use_v6_default_pool != 'undefined' ){
-        lvalue.value=use_v6_default_pool;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v4_dhcp_server_enabled');
-    if( v4_dhcp_server_enabled != 'undefined' ){
-        lvalue.value=v4_dhcp_server_enabled;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v6_dhcp_server_enabled');
-    if( v6_dhcp_server_enabled != 'undefined' ){
-        lvalue.value=v6_dhcp_server_enabled;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v6_dhcp_default_pool_prefix');
-    if( v6_dhcp_default_pool_prefix != 'undefined' ){
-        lvalue.value=v6_dhcp_default_pool_prefix;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v6_dhcp_default_pool_prefix_length');
-    if( v6_dhcp_default_pool_prefix_length != 'undefined' ){
-        lvalue.value=v6_dhcp_default_pool_prefix_length;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v4_dhcp_default_pool_prefix');
-    if( v4_dhcp_default_pool_prefix != 'undefined' ){
-        lvalue.value=v4_dhcp_default_pool_prefix;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v4_dhcp_default_pool_prefix_length');
-    if( v4_dhcp_default_pool_prefix_length != 'undefined' ){
-        lvalue.value=v4_dhcp_default_pool_prefix_length;
-    } else {
-        lvalue.value='';
-    }
-    $('#dhcp-modal').modal('show');
-}
-
-function routing_protocol(svc_instance_id, routing_protocol)
-{
-    document.getElementById('svc_instance_id').value = svc_instance_id;
-    var lvalue = document.getElementById('routing_protocol');
-    if( routing_protocol != 'undefined' ){
-        lvalue.value=routing_protocol;
-    } else {
-        lvalue.value='';
-    }
-    $('#routing-protocol-modal').modal('show');
-}
-function t_provided_v4_prefixes(svc_instance_id,v4_request_index,v4_lan_public_prefix_length,v4_lan_public_prefix)
-{
-    document.getElementById('svc_instance_id').value = svc_instance_id;
-    var lvalue = document.getElementById('v4_request_index');
-    if( v4_request_index != 'undefined' ){
-        lvalue.value=v4_request_index;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v4_lan_public_prefix_length');
-    if( v4_lan_public_prefix_length != 'undefined' ){
-        lvalue.value=v4_lan_public_prefix_length;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v4_lan_public_prefix');
-    if( v4_lan_public_prefix != 'undefined' ){
-        lvalue.value=v4_lan_public_prefix;
-    } else {
-        lvalue.value='';
-    }
-    $('#t-provided-v4-lan-public-prefixes-modal').modal('show');
-}
-
-function t_provided_v6_prefixes(svc_instance_id,v6_request_index,v6_lan_public_prefix_length,v6_lan_public_prefix)
-{
-    document.getElementById('svc_instance_id').value = svc_instance_id;
-    var lvalue = document.getElementById('v6_request_index');
-    if( v6_request_index != 'undefined' ){
-        lvalue.value=v6_request_index;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v6_lan_public_prefix_length');
-    if( v6_lan_public_prefix_length != 'undefined' ){
-        lvalue.value=v6_lan_public_prefix_length;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v6_lan_public_prefix');
-    if( v6_lan_public_prefix != 'undefined' ){
-        lvalue.value=v6_lan_public_prefix;
-    } else {
-        lvalue.value='';
-    }
-    $('#t-provided-v6-lan-public-prefixes-modal').modal('show');
-}
-
-function vrlan_interface(svc_instance_id,vr_designation,v6_vr_lan_prefix, v6_vr_lan_prefix_length, v6_vce_wan_address, v4_vr_lan_prefix_length, v4_vr_lan_prefix, t_defaulted_v6_vrlan,v4_vce_loopback_address)
-{
-    document.getElementById('svc_instance_id').value = svc_instance_id;
-    var lvalue = document.getElementById('vr_designation');
-    if( vr_designation != 'undefined' ){
-        lvalue.value=vr_designation;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v6_vr_lan_prefix');
-    if( v6_vr_lan_prefix != 'undefined' ){
-        lvalue.value=v6_vr_lan_prefix;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v6_vr_lan_prefix_length');
-    if( v6_vr_lan_prefix_length != 'undefined' ){
-        lvalue.value=v6_vr_lan_prefix_length;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v6_vce_wan_address');
-    if( v6_vce_wan_address != 'undefined' ){
-        lvalue.value=v6_vce_wan_address;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v4_vr_lan_prefix_length');
-    if( v4_vr_lan_prefix_length != 'undefined' ){
-        lvalue.value=v4_vr_lan_prefix_length;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v4_vr_lan_prefix');
-    if( v4_vr_lan_prefix != 'undefined' ){
-        lvalue.value=v4_vr_lan_prefix;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('v4_vce_loopback_address');
-    if( v4_vce_loopback_address != 'undefined' ){
-        lvalue.value=v4_vce_loopback_address;
-    } else {
-        lvalue.value='';
-    }
-    lvalue = document.getElementById('t_defaulted_v6_vrlan');
-    if( t_defaulted_v6_vrlan != 'undefined' ){
-        lvalue.value=t_defaulted_v6_vrlan;
-    } else {
-        lvalue.value='';
-    }
-    $('#vr-lan-interface-modal').modal('show');
-}
-
-function getvrlan(svc_instance_id)
-{
-location.assign("/odl/getvrlan?request=" + svc_instance_id);
-return;
-}
-
-function svcInfo(service_instance_id,subscriber_name,service_type){
-	var lvalue = document.getElementById('service_instance_id'); 
-	if( service_instance_id != 'undefined' ){
-		lvalue.value=service_instance_id;
-	} else {
-		lvalue.value='';
-	}
-	lvalue = document.getElementById('subscriber_name'); 
-	if( subscriber_name != 'undefined' ){
-		lvalue.value=subscriber_name;
-	} else {
-		lvalue.value='';
-	}
-	lvalue = document.getElementById('service_type'); 
-	if( service_type != 'undefined' ){
-		lvalue.value=service_type;
-	} else {
-		lvalue.value='';
-	}
-	$('#service-information-modal').modal('show');
-}
-function l2Homing(evc_name,preferred_aic_clli,topology){
-	var lvalue = document.getElementById('evc_name'); 
-	if( evc_name != 'undefined' ){
-		lvalue.value=evc_name;
-	} else {
-		lvalue.value='';
-	}
-	lvalue = document.getElementById('preferred_aic_clli'); 
-	if( preferred_aic_clli != 'undefined' ){
-		lvalue.value=preferred_aic_clli;
-	} else {
-		lvalue.value='';
-	}
-	lvalue = document.getElementById('topology'); 
-	if( topology != 'undefined' ){
-		lvalue.value=topology;
-	} else {
-		lvalue.value='';
-	}
-	$('#l2-homing-information-modal').modal('show');
-}
-function reqHeader(svc_notification_url, svc_request_id, svc_action){
-	var lvalue = document.getElementById('svc_notification_url'); 
-	if( svc_notification_url != 'undefined' ){
-		lvalue.value=svc_notification_url;
-	} else {
-		lvalue.value='';
-	}
-	lvalue = document.getElementById('svc_request_id'); 
-	if( svc_request_id != 'undefined' ){
-		lvalue.value=svc_request_id;
-	} else {
-		lvalue.value='';
-	}
-	lvalue = document.getElementById('svc_action'); 
-	if( svc_action != 'undefined' ){
-		lvalue.value=svc_action;
-	} else {
-		lvalue.value='';
-	}
-	$('#sdnc-request-header-modal').modal('show');
-}
-function reqInfo(notification_url, source, order_number, request_id, order_version, 
-	request_action, request_sub_action){
-
-	var lvalue = document.getElementById('notification_url'); 
-	if( notification_url != 'undefined' ){
-		lvalue.value=notification_url;
-	} else {
-		lvalue.value='';
-	}
-	lvalue = document.getElementById('source'); 
-	if( source != 'undefined' ){
-		lvalue.value=source;
-	} else {
-		lvalue.value='';
-	}
-	lvalue = document.getElementById('order_number'); 
-	if( order_number != 'undefined' ){
-		lvalue.value=order_number;
-	} else {
-		lvalue.value='';
-	}
-	lvalue = document.getElementById('request_id'); 
-	if( request_id != 'undefined' ){
-		lvalue.value=request_id;
-	} else {
-		lvalue.value='';
-	}
-	lvalue = document.getElementById('order_version'); 
-	if( order_version != 'undefined' ){
-		lvalue.value=order_version;
-	} else {
-		lvalue.value='';
-	}
-	lvalue = document.getElementById('request_action'); 
-	if( request_action != 'undefined' ){
-		lvalue.value=request_action;
-	} else {
-		lvalue.value='';
-	}
-	lvalue = document.getElementById('request_sub_action'); 
-	if( request_sub_action != 'undefined' ){
-		lvalue.value=request_sub_action;
-	} else {
-		lvalue.value='';
-	}
-	$('#request-information-modal').modal('show');
-}
-function svcTopo(svc_vnf_type){
-	var lvalue = document.getElementById('svc_vnf_type'); 
-	if( svc_vnf_type != 'undefined' ){
-		lvalue.value=svc_vnf_type;
-	} else {
-		lvalue.value='';
-	}
-	$('#svc-topology-additional-data-modal').modal('show');
-}
-function operStatus(order_status, modify_timestamp,last_svc_request_id,last_sub_action,
-	t_defaulted_v6_vrlan, last_action, create_timestamp, maintenance_indicator, last_order_status){
-	var lvalue = document.getElementById('order_status'); 
-	if( order_status != 'undefined' ){
-		lvalue.value=order_status;
-	} else {
-		lvalue.value='';
-	}
-	lvalue = document.getElementById('modify_timestamp'); 
-	if( modify_timestamp != 'undefined' ){
-		lvalue.value=modify_timestamp;
-	} else {
-		lvalue.value='';
-	}
-	lvalue = document.getElementById('last_svc_request_id'); 
-	if( last_svc_request_id != 'undefined' ){
-		lvalue.value=last_svc_request_id;
-	} else {
-		lvalue.value='';
-	}
-	lvalue = document.getElementById('last_sub_action'); 
-	if( last_sub_action != 'undefined' ){
-		lvalue.value=last_sub_action;
-	} else {
-		lvalue.value='';
-	}
-	lvalue = document.getElementById('t_defaulted_v6_vrlan'); 
-	if( t_defaulted_v6_vrlan != 'undefined' ){
-		lvalue.value=t_defaulted_v6_vrlan;
-	} else {
-		lvalue.value='';
-	}
-	lvalue = document.getElementById('last_action'); 
-	if( last_action != 'undefined' ){
-		lvalue.value=last_action;
-	} else {
-		lvalue.value='';
-	}
-	lvalue = document.getElementById('create_timestamp'); 
-	if( create_timestamp != 'undefined' ){
-		lvalue.value=create_timestamp;
-	} else {
-		lvalue.value='';
-	}
-	lvalue = document.getElementById('maintenance_indicator'); 
-	if( maintenance_indicator != 'undefined' ){
-		lvalue.value=maintenance_indicator;
-	} else {
-		lvalue.value='';
-	}
-	lvalue = document.getElementById('last_order_status'); 
-	if( last_order_status != 'undefined' ){
-		lvalue.value=last_order_status;
-	} else {
-		lvalue.value='';
-	}
-	$('#oper-status-modal').modal('show');
-}
-function internetInfo(ip_version,internet_evc_speed_value,internet_evc_speed_units){
-
-	var lvalue = document.getElementById('ip_version'); 
-	if( ip_version != 'undefined' ){
-		lvalue.value=ip_version;
-	} else {
-		lvalue.value='';
-	}
-	lvalue = document.getElementById('internet_evc_speed_value'); 
-	if( internet_evc_speed_value != 'undefined' ){
-		lvalue.value=internet_evc_speed_value;
-	} else {
-		lvalue.value='';
-	}
-	lvalue = document.getElementById('internet_evc_speed_units'); 
-	if( internet_evc_speed_units != 'undefined' ){
-		lvalue.value=internet_evc_speed_units;
-	} else {
-		lvalue.value='';
-	}
-	$('#internet-evc-modal').modal('show');
-}
-function serviceStatus( rpc_name, final_indicator, request_status, rpc_action, l3sdn_action, l3sdn_subaction, response_message, response_code, response_timestamp){
-
-	var lvalue = document.getElementById('rpc_name'); 
-	if( rpc_name != 'undefined' ){
-		lvalue.value=rpc_name;
-	} else {
-		lvalue.value='';
-	}
-	lvalue = document.getElementById('final_indicator'); 
-	if( final_indicator != 'undefined' ){
-		lvalue.value=final_indicator;
-	}else{
-		lvalue.value='';
-	}
-	lvalue = document.getElementById('request_status'); 
-	if( request_status != 'undefined' ){
-		lvalue.value=request_status;
-	}else{
-		lvalue.value='';
-	}
-	lvalue = document.getElementById('rpc_action'); 
-	if( rpc_action != 'undefined' ){
-		lvalue.value=rpc_action;
-	}else{
-		lvalue.value='';
-	}
-	lvalue = document.getElementById('l3sdn_action'); 
-	if( l3sdn_action != 'undefined' ){
-		lvalue.value=l3sdn_action;
-	}else{
-		lvalue.value='';
-	}
-	lvalue = document.getElementById('l3sdn_subaction'); 
-	if( l3sdn_subaction != 'undefined' ){
-		lvalue.value=l3sdn_subaction;
-	}else{
-		lvalue.value='';
-	}
-	lvalue = document.getElementById('response_message'); 
-	if( response_message != 'undefined' ){
-		lvalue.value=response_message;
-	}else{
-		lvalue.value='';
-	}
-	lvalue = document.getElementById('response_code'); 
-	if( lvalue != 'undefined' ){
-		response_code.value=response_code;
-	}else{
-		lvalue.value='';
-	}
-	lvalue = document.getElementById('response_timestamp'); 
-	if( response_timestamp != 'undefined' ){
-		lvalue.value=response_timestamp;
-	}else{
-		lvalue.value='';
-	}
-	$('#service-status-modal').modal('show');
-}
-</script>
-
-</body>
-</html>
-
diff --git a/admportal/views/odl/view.ejs b/admportal/views/odl/view.ejs
deleted file mode 100644
index 34d7d935..00000000
--- a/admportal/views/odl/view.ejs
+++ /dev/null
@@ -1,91 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <title>SDN-C AdminPortal</title>
-  <meta charset="utf-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-</head>
-<body class="container">
-
-<div class="actions" style="padding:0px 25px;">
-<h2>Worklist Orders - Request ID:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<%= response_obj.requests[0]['svc-request-id'] %></h2>
-</div>
-
-<div class="actions" style="padding:15px 0px;">
-	<button type="button" class="btn btn-primary aria-expanded="false" 
-			onclick="viewVNF('/odl/getvnf?request=<%= response_obj.requests[0]['svc-request-id'] %>')">VNF</button>
-</div>
-
-
-<div class="table-responsive">
-    <table class="table table-bordered">
-      <colgroup>
-        <col class="col-xs-1">
-        <col class="col-xs-7">
-      </colgroup>
-      <tbody>
-        <tr>
-          <th scope="row">Instance ID</th>
-          <td><%= response_obj.requests[0]['svc-instance-id'] %></td>
-        </tr>
-        <tr>
-          <th scope="row">Action</th>
-          <td><%= response_obj.requests[0]['svc-action'] %></td>
-        </tr>
-        <tr>
-          <th scope="row">VNF Type</th>
-          <td><%= response_obj.requests[0]['svc-vnf-type'] %></td>
-        </tr>
-        <tr>
-          <th scope="row">Notification URL</th>
-          <td><%= response_obj.requests[0]['svc-notification-url'] %></td>
-        </tr>
-        <tr>
-          <th scope="row">VNF Name</th>
-          <td><%= response_obj.requests[0].vnf['vnf-name'] %></td>
-        </tr>
-        <tr>
-          <th scope="row">VNF IPv4 Addr</th>
-          <td><%= response_obj.requests[0].vnf['vnf-oam-ipv4-addr'] %></td>
-        </tr>
-        <tr>
-          <th scope="row">VNF Type</th>
-          <td><%= response_obj.requests[0].vnf['vnf-type'] %></td>
-        </tr>
-        <tr>
-          <th scope="row">VNF Status</th>
-          <td><%= response_obj.requests[0].vnf['vnf-status'] %></td>
-        </tr>
-        <tr>
-          <th scope="row">AIC Site ID</th>
-          <td><%= response_obj.requests[0].vnf['aic-site-id'] %></td>
-        </tr>
-        <tr>
-          <th scope="row">Availability Zone</th>
-          <td><%= response_obj.requests[0].vnf['availability-zone'] %></td>
-        </tr>
-        <tr>
-          <th scope="row">Network Connection(s)</th>
-          <td><pre><%= JSON.stringify(response_obj.requests[0].vnf['network-connections'],null,4) %></pre></td>
-        </tr>
-      </tbody>
-    </table>
-  </div>
-
-   <% include ../partials/form %>
-
-    <footer>
-        <% include ../partials/footer %>
-    </footer>
-<script type="text/javascript">
-function viewVNF( requestid ) {
-alert(requestid);
-	location.assign(requestid);
-}
-</script>
-
-</body>
-</html>
-
diff --git a/admportal/views/odl/viewvnf.ejs b/admportal/views/odl/viewvnf.ejs
deleted file mode 100644
index dd2e05c9..00000000
--- a/admportal/views/odl/viewvnf.ejs
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <title>SDN-C AdminPortal</title>
-  <meta charset="utf-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-</head>
-
-<body class="container">
-
-<div class="actions" style="padding:0px 25px;">
-<h2>Worklist Orders - VNF - Request ID <%= request_id %></h2>
-</div>
-
-<div class="table-responsive">
-    <table class="table table-bordered">
-      <colgroup>
-        <col class="col-xs-1">
-        <col class="col-xs-7">
-      </colgroup>
-      <tbody>
-        <tr>
-          <th scope="row">VNF OAM IPv4 Addr</th>
-          <td><%= vnf_obj.vnf['vnf-oam-ipv4-addr'] %></td>
-        </tr>
-        <tr>
-          <th scope="row">AIC Site ID</th>
-          <td><%= vnf_obj.vnf['aic-site-id'] %></td>
-        </tr>
-        <tr>
-          <th scope="row">VNF Name</th>
-          <td><%= vnf_obj.vnf['vnf-name'] %></td>
-        </tr>
-        <tr>
-          <th scope="row">VNF Type</th>
-          <td><%= vnf_obj.vnf['vnf-type'] %></td>
-        </tr>
-        <tr>
-          <th scope="row">VNF Status</th>
-          <td><%= vnf_obj.vnf['vnf-status'] %></td>
-        </tr>
-        <tr>
-          <th scope="row">Availability Zone</th>
-          <td><%= vnf_obj.vnf['availability-zone'] %></td>
-        </tr>
-		<tr>
-          <th scope="row">Network Connection(s)</th>
-          <td><pre><%= JSON.stringify(vnf_obj.vnf['network-connections'],null,4) %></pre></td>
-        </tr>
-
-	</tbody>
-    </table>
- </div>
-
-    <footer>
-        <% include ../partials/footer %>
-    </footer>
-</body>
-</html>
-
diff --git a/admportal/views/pages/csplogout.ejs b/admportal/views/pages/csplogout.ejs
deleted file mode 100644
index 971feda6..00000000
--- a/admportal/views/pages/csplogout.ejs
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-
-<% if (header == 'gamma') { %>
-  <title>SDN-C AdminPortal</title>
-<% } else if(header == 'sdn-mlc'){ %>
-  <title>SDNC-MLC AdminPortal</title>
-<% } else { %>
-  <title>SDN-C AdminPortal</title>
-<% } %>
-
-  <meta charset="utf-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-</head>
-<body class="container">
-
-<div class="actions" style="padding:0px 25px;">
-<% if (header == 'gamma') { %>
-  <h2>SDN-C Admin Portal</h2>
-<% } else if(header == 'sdn-mlc'){ %>
-  <h2>SDNC-MLC Admin Portal</h2>
-<% } else { %>
-  <h2>SDN-C Admin Portal</h2>
-<% } %>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-        if (result.code.length > 0) {
-            if ( result.code == 'success' ) { %>
-                <div class='alert alert-success' role='alert'><%=result.msg %></div>
-            <% } else { %>
-                <div class='alert alert-danger' role='danger'><%=result.msg %></div>
-            <% } %>
-        <% } %>
-<% } %>
-
-<p><a href="/login">Click here to login</a></p>
-
-
-<footer>
-         <% include ../partials/footer %>
-</footer>
-
-</body>
-</html>
diff --git a/admportal/views/pages/err.ejs b/admportal/views/pages/err.ejs
deleted file mode 100644
index cf5c3004..00000000
--- a/admportal/views/pages/err.ejs
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <title>SDN-C AdminPortal</title>
-  <meta charset="utf-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-</head>
-<body class="container">
-
-<div class="actions" style="padding:0px 25px;">
-<h2>System Error</h2>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-        if (result.code.length > 0) {
-            if ( result.code == 'success' ) { %>
-                <div class='alert alert-success' role='alert'><%=result.msg %></div>
-            <% } else { %>
-                <div class='alert alert-danger' role='danger'><%=result.msg %></div>
-            <% } %>
-        <% } %>
-<% } %>
-
-
-<footer>
-	 <% include ../partials/footer %>
-</footer>
-    
-</body>
-</html>
-
diff --git a/admportal/views/pages/home.ejs b/admportal/views/pages/home.ejs
deleted file mode 100644
index 3eb4a0a9..00000000
--- a/admportal/views/pages/home.ejs
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <title>SDN-C AdminPortal</title>
-  <meta charset="utf-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-</head>
-<body class="container">
-
-<div class="actions" style="padding:0px 25px;">
-<h2>SDN-C Admin Portal</h2>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-        if (result.code.length > 0) {
-            if ( result.code == 'success' ) { %>
-                <pre class='alert alert-success' role='alert'><%=result.msg %></pre>
-            <% } else { %>
-                <pre class='alert alert-danger' role='danger'><%=result.msg %></pre>
-            <% } %>
-        <% } %>
-<% } %>
-
-
-<footer>
-	 <% include ../partials/footer %>
-</footer>
-    
-</body>
-</html>
-
diff --git a/admportal/views/pages/home.ejs.orig b/admportal/views/pages/home.ejs.orig
deleted file mode 100644
index 353bc457..00000000
--- a/admportal/views/pages/home.ejs.orig
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>SDN-C Admin Portal</title>
-  </head>
-  <body>
-    <h1>SDN-C Admin Portal</h1>
-    <p>Welcome to SDN-C Admin Portal</p>
-<% if ( typeof loggedInAdmin != 'undefined') { %>
-    <p><%= loggedInAdmin.firstName %></p>
-<% } %>
-<% if ( typeof result != 'undefined') { %>
-    <p><%= result %></p>
-<% } %>
-<% if ( typeof errmsg != 'undefined') { %>
-    <p><%= errmsg %></p>
-<% } %>
-
-  </body>
-</html>
diff --git a/admportal/views/pages/login.ejs b/admportal/views/pages/login.ejs
deleted file mode 100644
index 9da2f31d..00000000
--- a/admportal/views/pages/login.ejs
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
-  	<title>AdminPortal</title>
-
-
-    <!-- Bootstrap core CSS -->
-  	<% include ../partials/head %>
-
-    <!-- Custom styles for this template -->
-	<link rel="stylesheet" href="/stylesheets/signin.css">
-
-  </head>
-
-  <body>
-
-<% if ( typeof result != 'undefined' ) {
-        if (result.code.length > 0) {
-            if ( result.code == 'success' ) { %>
-                <div class='alert alert-success' role='alert'><%=result.msg %></div>
-            <% } else { %>
-                <div class='alert alert-danger' role='danger'><%=result.msg %></div>
-            <% } %>
-        <% } %>
-<% } %>
-
-    <div class="container">
-
-      <form class="form-signin" method="POST" action="/formlogin">
-        <h3 class="form-signin-heading">AdminPortal Login</h3>
-
-				<input type="hidden" name="_csrf" value="<%= csrfToken %>" />
-        <input type="text" name="email" id="email" class="form-control" placeholder="Email" required>
-        <input type="password" name="password" id="password" class="form-control" placeholder="Password" required>
-
-        <button class="btn btn-lg btn-primary btn-block" type="submit">Submit</button>
-      </form>
-
-    </div> <!-- /container -->
-
-  </body>
-</html>
diff --git a/admportal/views/pages/setuplogin.ejs b/admportal/views/pages/setuplogin.ejs
deleted file mode 100644
index ef75e84a..00000000
--- a/admportal/views/pages/setuplogin.ejs
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
-  	<title>SDN-C AdminPortal</title>
-
-
-    <!-- Bootstrap core CSS -->
-  	<% include ../partials/head %>
-
-    <!-- Custom styles for this template -->
-	<link rel="stylesheet" href="/stylesheets/signin.css">
-
-  </head>
-
-  <body>
-
-<% if ( typeof result != 'undefined' ) {
-        if (result.code.length > 0) {
-            if ( result.code == 'success' ) { %>
-                <div class='alert alert-success' role='alert'><%=result.msg %></div>
-            <% } else { %>
-                <div class='alert alert-danger' role='danger'><%=result.msg %></div>
-            <% } %>
-        <% } %>
-<% } %>
-
-    <div class="container">
-
-      <form class="form-signin" method="POST" action="/formSetupLogin">
-        <h3 class="form-signin-heading">Enter Initial User Information</h3>
-
-        <label for="firstName" class="sr-only">First Name</label>
-        <input type="text" name="firstName" id="firstName" class="form-control" placeholder="First Name" required autofocus>
-
-        <label for="lastName" class="sr-only">Last Name</label>
-        <input type="text" name="lastName" id="lastName" class="form-control" placeholder="Last Name" required>
-
-        <label for="attuid" class="sr-only">ATTUID</label>
-        <input type="text" name="attuid" id="attuid" class="form-control" placeholder="ATTUID" required>
-
-        <button class="btn btn-lg btn-primary btn-block" type="submit">Setup Login</button>
-      </form>
-
-    </div> <!-- /container -->
-
-  </body>
-</html>
diff --git a/admportal/views/pages/signup.ejs b/admportal/views/pages/signup.ejs
deleted file mode 100644
index 2a039531..00000000
--- a/admportal/views/pages/signup.ejs
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
-  	<title>AdminPortal</title>
-
-
-    <!-- Bootstrap core CSS -->
-  	<% include ../partials/head %>
-
-    <!-- Custom styles for this template -->
-	<link rel="stylesheet" href="/stylesheets/signin.css">
-
-  </head>
-
-  <body>
-
-<% if ( typeof result != 'undefined' ) {
-        if (result.code.length > 0) {
-            if ( result.code == 'success' ) { %>
-                <div class='alert alert-success' role='alert'><%=result.msg %></div>
-            <% } else { %>
-                <div class='alert alert-danger' role='danger'><%=result.msg %></div>
-            <% } %>
-        <% } %>
-<% } %>
-
-    <div class="container">
-
-      <form class="form-signin" method="POST" action="/formSignUp">
-        <h3 class="form-signin-heading">AdminPortal Signup</h3>
-
-				<input type="hidden" name="_csrf" value="<%= csrfToken %>" />
-        <input type="email" name="nf_email" id="nf_email" class="form-control" placeholder="Email Address" required>
-        <input type="password" name="nf_password" id="nf_password" class="form-control" placeholder="Password" required>
-
-        <button class="btn btn-lg btn-primary btn-block" type="submit">Submit</button>
-      </form>
-
-    </div> <!-- /container -->
-
-  </body>
-</html>
diff --git a/admportal/views/pages/testdb.ejs b/admportal/views/pages/testdb.ejs
deleted file mode 100644
index 837b479b..00000000
--- a/admportal/views/pages/testdb.ejs
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <title>SDN-C AdminPortal</title>
-  <meta charset="utf-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/ro_header %>
-</head>
-<body class="container">
-
-<div class="actions" style="padding:0px 25px;">
-<h2>SDN-C AdminPortal Healthcheck</h2>
-</div>
-
-<% if (typeof osObj != 'undefined')
-{ %>
-	<pre>
-		Hostname     : <%= osObj.hostname %>
-		Type         : <%= osObj.type %>
-		Platform     : <%= osObj.platform %>
-		Architecture : <%= osObj.arch %>
-		Release      : <%= osObj.release %>
-		Uptime       : <%= osObj.uptime %>
-		Total Memory : <%= osObj.totalmem %>
-	
-		<%= osObj.dbhealth %>
-	</pre>
-<% } %>
-
-
-<footer>
-	 <% include ../partials/footer %>
-</footer>
-    
-</body>
-</html>
-
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>
diff --git a/admportal/views/resalloc/max_port_speed.ejs b/admportal/views/resalloc/max_port_speed.ejs
deleted file mode 100644
index b46b14d9..00000000
--- a/admportal/views/resalloc/max_port_speed.ejs
+++ /dev/null
@@ -1,205 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#max_port_speed').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>Max Port Speed</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-		if (result.code.length > 0) { 
-			if ( result.code == 'success' ) { %>
-				<div class='alert alert-success' role='alert'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } else { %> 
-				<div class='alert alert-danger' role='danger'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } %>
-		<% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-
-	<% if (priv == 'A'){ %>
-		<div class="actions" style="padding:15px 0px;">
-    	<button class="btn btn-primary" data-toggle="modal" data-target="#add_max_port_speed">
-      	Add Max Port Speed
-    	</button>
-		</div>
-	<% } %>
-
-	<table id="max_port_speed" class="table table-hover table-condensed">
-      <thead>
-        <tr>
-		  <th>*ID</th>
-          <th>*Image File Name</th>
-		  <th>*End Point Position</th>
-          <th>*Interface Name</th>
-          <th>*Max Speed</th>
-          <th>*Unit</th>
-		   <% if(priv == 'A'){ %>
-          <th>Action</th>
-          <% } %>
-        </tr>
-      </thead>
-      <tbody>
-      <% rows.forEach( function(row) { %> 
-        <tr>
-            <td><%= row.max_port_speed_id %></td>
-            <td><%= row.image_file_name %></td>
-            <td><%= row.end_point_position %></td>
-            <td><%= row.interface_name %></td>
-            <td><%= row.max_speed %></td>
-            <td><%= row.unit %></td>
-			<% if(priv == 'A') { %>
-            <td>
-				<button type="button" class="btn btn-default btn-xs"
-                    onclick="updateMaxPortSpeed('<%=row.max_port_speed_id %>','<%= row.image_file_name %>','<%= row.end_point_position %>','<%= row.interface_name %>','<%= row.max_speed %>','<%= row.unit %>');">Update</button>
-				<button type="button" class="btn btn-default btn-xs"
-                   onclick="deleteMaxPortSpeed('<%= row.max_port_speed_id %>');">Delete</button>
-            </td>
-            <% } %>
-
-        </tr>
-    <% }); %>
-      </tbody>
-    </table>
-
-</div>
-
-<% include ../partials/max_port_speed %>
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-<script type="text/javascript">
-function submitMaxPortSpeed(form)
-{
-    var errorMsg='';
-	var image_file_name = '';
-	var end_point_position = '';
-	var interface_name = '';
-	var max_speed = '';
-	var unit = '';
-
-    if ( form.name == 'addForm' )
-    {
-		image_file_name = form.nf_image_file_name;
-		end_point_position = form.nf_end_point_position;
-		interface_name = form.nf_interface_name;
-		max_speed = form.nf_max_speed;
-		unit = form.nf_unit;
-    }
-    else
-    {
-		image_file_name = form.uf_image_file_name;
-		end_point_position = form.uf_end_point_position;
-		interface_name = form.uf_interface_name;
-		max_speed = form.uf_max_speed;
-		unit = form.uf_unit;
-    }
-
-
-    if ( (image_file_name.value == null) || (image_file_name.value == "") || isblank(image_file_name.value) )
-    {
-        errorMsg += 'Image File Name is required.<br>';
-    }
-    if ( (end_point_position.value == null) || (end_point_position.value == "") || isblank(end_point_position.value) )
-    {
-        errorMsg += 'End Point Position is required.<br>';
-    }
-    if ( (interface_name.value == null) || (interface_name.value == "") || isblank(interface_name.value) ){
-        errorMsg += 'Interface Name is required.<br>';
-    }
-    if ( (max_speed.value == null) || (max_speed.value == "") || isblank(max_speed.value) ){
-        errorMsg += 'Max Speed is required.<br>';
-    }
-    if ( (unit.value == null) || (unit.value == "") || isblank(unit.value) ){
-        errorMsg += 'Unit is required.<br>';
-    }
-    if( errorMsg.length > 0 ) {
-        bootbox.alert(errorMsg);
-        return;
-    }
-
-	if ( !isDigit(max_speed.value) )
-    {
-        bootbox.alert('Max Speed must be a number.');
-        return;
-    }
-
-    form.submit();
-}
-
-function updateMaxPortSpeed(max_port_speed_id,image_file_name,end_point_position,interface_name,max_speed,unit) {
-
-    document.getElementById('uf_max_port_speed_id').value=max_port_speed_id;
-    document.getElementById('uf_image_file_name').value=image_file_name;
-    document.getElementById('uf_end_point_position').value=end_point_position;
-    document.getElementById('uf_interface_name').value=interface_name;
-    document.getElementById('uf_max_speed').value=max_speed;
-    document.getElementById('uf_unit').value=unit;
-
-    document.getElementById('uf_key_max_port_speed_id').value=max_port_speed_id;
-
-    $('#update_max_port_speed').modal('show');
-}
-
-function deleteMaxPortSpeed(max_port_speed_id) {
-
-    bootbox.confirm({
-        message: "Are you sure you want to delete MAX_PORT_SPEED [" + max_port_speed_id + "]",
-        callback: function(result) {
-            if ( result )
-            {
-				location.assign("/resalloc/deleteMaxPortSpeed?max_port_speed_id=" + max_port_speed_id);
-            }
-            return;
-        },
-        buttons: {
-            cancel: {
-                label: "Cancel"
-            },
-            confirm: {
-                label: "Yes"
-            }
-        }
-    });
-}
-
-</script>
-
-</body>
-</html>
-
diff --git a/admportal/views/resalloc/max_server_speed.ejs b/admportal/views/resalloc/max_server_speed.ejs
deleted file mode 100644
index c0848df8..00000000
--- a/admportal/views/resalloc/max_server_speed.ejs
+++ /dev/null
@@ -1,207 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#max_server_speed').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>Max Server Speed</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-		if (result.code.length > 0) { 
-			if ( result.code == 'success' ) { %>
-				<div class='alert alert-success' role='alert'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } else { %> 
-				<div class='alert alert-danger' role='danger'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } %>
-		<% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-
-	<% if (priv == 'A'){ %>
-		<div class="actions" style="padding:15px 0px;">
-    	<button class="btn btn-primary" data-toggle="modal" data-target="#add_max_server_speed">
-      	Add Max Server Speed
-    	</button>
-		</div>
-	<% } %>
-
-	<table id="max_server_speed" class="table table-hover table-condensed">
-      <thead>
-        <tr>
-		  <th>*ID</th>
-          <th>*Server Model</th>
-		  <th>*EVC Count</th>
-          <th>*Max Speed</th>
-          <th>*Unit</th>
-          <th>Description</th>
-		   <% if(priv == 'A'){ %>
-          <th>Action</th>
-          <% } %>
-        </tr>
-      </thead>
-      <tbody>
-      <% rows.forEach( function(row) { %> 
-        <tr>
-            <td><%= row.max_server_speed_id %></td>
-            <td><%= row.server_model %></td>
-            <td><%= row.evc_count %></td>
-            <td><%= row.max_speed %></td>
-            <td><%= row.unit %></td>
-            <td><%= row.description %></td>
-			<% if(priv == 'A') { %>
-            <td>
-				<button type="button" class="btn btn-default btn-xs"
-                    onclick="updateMaxServerSpeed('<%=row.max_server_speed_id %>','<%= row.server_model %>','<%= row.evc_count %>','<%= row.max_speed %>','<%= row.unit %>', '<%= row.description %>');">Update</button>
-				<button type="button" class="btn btn-default btn-xs"
-                   onclick="deleteMaxServerSpeed('<%= row.max_server_speed_id %>');">Delete</button>
-            </td>
-            <% } %>
-
-        </tr>
-    <% }); %>
-      </tbody>
-    </table>
-
-</div>
-
-<% include ../partials/max_server_speed %>
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-<script type="text/javascript">
-function submitMaxServerSpeed(form)
-{
-    var errorMsg='';
-	var server_model = '';
-	var evc_count = '';
-	var max_speed = '';
-	var unit = '';
-	var description = '';
-
-    if ( form.name == 'addForm' )
-    {
-		server_model = form.nf_server_model;
-		evc_count = form.nf_evc_count;
-        max_speed = form.nf_max_speed;
-		unit = form.nf_unit;
-		description = form.nf_description;
-    }
-    else
-    {
-		server_model = form.uf_server_model;
-		evc_count = form.uf_evc_count;
-        max_speed = form.uf_max_speed;
-		unit = form.uf_unit;
-		description = form.uf_description;
-    }
-
-
-    if ( (server_model.value == null) || (server_model.value == "") || isblank(server_model.value) )
-    {
-        errorMsg += 'Server Model is required.<br>';
-    }
-    if ( (evc_count.value == null) || (evc_count.value == "") || isblank(evc_count.value) )
-    {
-        errorMsg += 'EVC Count is required.<br>';
-    }
-    if ( (max_speed.value == null) || (max_speed.value == "") || isblank(max_speed.value) ){
-        errorMsg += 'Max Speed is required.<br>';
-    }
-    if ( (unit.value == null) || (unit.value == "") || isblank(unit.value) ){
-        errorMsg += 'Unit is required.<br>';
-    }
-    if( errorMsg.length > 0 ) {
-        bootbox.alert(errorMsg);
-        return;
-    }
-
-    if ( !isDigit(evc_count.value) )
-    {
-        bootbox.alert('EVC Count must be a number.');
-        return;
-    }
-    if ( !isDigit(max_speed.value) )
-    {
-        bootbox.alert('Max Speed must be a number.');
-        return;
-    }
-
-    form.submit();
-}
-
-function updateMaxServerSpeed(max_server_speed_id,server_model,evc_count,max_speed,unit,description) {
-
-    document.getElementById('uf_max_server_speed_id').value=max_server_speed_id;
-    document.getElementById('uf_server_model').value=server_model;
-    document.getElementById('uf_evc_count').value=evc_count;
-    document.getElementById('uf_max_speed').value=max_speed;
-    document.getElementById('uf_unit').value=unit;
-    document.getElementById('uf_description').value=description;
-
-    document.getElementById('uf_key_max_server_speed_id').value=max_server_speed_id;
-
-    $('#update_max_server_speed').modal('show');
-}
-
-function deleteMaxServerSpeed(max_server_speed_id) {
-
-    bootbox.confirm({
-        message: "Are you sure you want to delete MAX_SERVER_SPEED [" + max_server_speed_id + "]",
-        callback: function(result) {
-            if ( result )
-            {
-				location.assign("/resalloc/deleteMaxServerSpeed?max_server_speed_id=" + max_server_speed_id);
-            }
-            return;
-        },
-        buttons: {
-            cancel: {
-                label: "Cancel"
-            },
-            confirm: {
-                label: "Yes"
-            }
-        }
-    });
-}
-
-</script>
-
-</body>
-</html>
-
diff --git a/admportal/views/resalloc/resource_rule.ejs b/admportal/views/resalloc/resource_rule.ejs
deleted file mode 100644
index 4171fc67..00000000
--- a/admportal/views/resalloc/resource_rule.ejs
+++ /dev/null
@@ -1,228 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#resource_rule').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well wel-sm">
-<h3>Resource Rule</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-		if (result.code.length > 0) { 
-			if ( result.code == 'success' ) { %>
-				<div class='alert alert-success' role='alert'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } else { %> 
-				<div class='alert alert-danger' role='danger'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } %>
-		<% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-
-	 <% if(priv == 'A'){ %>
-        <div class="actions" style="padding:15px 0px;">
-            <button class="btn btn-primary" data-toggle="modal" data-target="#add_resource_rule">
-            Add Resource Rule
-            </button>
-            </div>
-    <% } %>
-
-	<table id="resource_rule" class="table table-hover table-condensed">
-      <thead>
-        <tr>
-		  <th>*ID</th>
-          <th>*Name</th>
-		  <th>*End Point Position</th>
-          <th>*Service Expression</th>
-          <th>*Equipment Level</th>
-          <th>*Equipment Expression</th>
-          <th>*Allocation Expression</th>
-          <th>*Soft Limit Expression</th>
-          <th>*Hard Limit Expression</th>
-          <th>*Service Model</th>
-		   <% if(priv == 'A'){ %>
-          <th>Action</th>
-          <% } %>
-        </tr>
-      </thead>
-      <tbody>
-      <% rows.forEach( function(row) { %> 
-        <tr>
-            <td><%= row.resource_rule_id %></td>
-            <td><%= row.resource_name %></td>
-            <td><%= row.end_point_position %></td>
-            <td><%= row.service_expression %></td>
-            <td><%= row.equipment_level %></td>
-            <td><%= row.equipment_expression %></td>
-            <td><%= row.allocation_expression %></td>
-            <td><%= row.soft_limit_expression %></td>
-            <td><%= row.hard_limit_expression %></td>
-            <td><%= row.service_model %></td>
-			<% if(priv == 'A') { %>
-            <td>
-				<button type="button" class="btn btn-default btn-xs"
-                    onclick="updateResourceRule('<%=row.resource_rule_id %>','<%= row.resource_name %>','<%= row.end_point_position %>','<%= row.service_expression %>','<%= row.equipment_level %>','<%= row.equipment_expression %>','<%= row.allocation_expression %>','<%= row.soft_limit_expression %>', '<%= row.hard_limit_expression %>','<%= row.service_model %>');">Update</button>
-				<button type="button" class="btn btn-default btn-xs"
-                   onclick="deleteResourceRule('<%= row.resource_rule_id %>');">Delete</button>
-            </td>
-            <% } %>
-
-        </tr>
-    <% }); %>
-      </tbody>
-    </table>
-
-</div>
-
-<% include ../partials/resource_rule %>
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-<script type="text/javascript">
-function submitResourceRule(form)
-{
-    var errorMsg='';
-    var resource_name = '';
-	var end_point_position = '';
-	var service_expression = '';
-	var equipment_level = '';
-	var equipment_expression = '';
-	var allocation_expression = '';
-	var soft_limit_expression = '';
-	var hard_limit_expression = '';
-	var service_model = '';
-
-    if ( form.name == 'addForm' )
-    {
-		resource_name = form.nf_resource_name;
-		end_point_position = form.nf_end_point_position;
-		service_expression = form.nf_service_expression;
-		equipment_level = form.nf_equipment_level;
-		allocation_expression = form.nf_allocation_expression;
-		soft_limit_expression = form.nf_soft_limit_expression;
-		hard_limit_expression = form.nf_hard_limit_expression;
-		service_model = form.nf_service_model;
-    }
-    else
-    {
-		resource_name = form.uf_resource_name;
-		end_point_position = form.uf_end_point_position;
-		service_expression = form.uf_service_expression;
-		equipment_level = form.uf_equipment_level;
-		allocation_expression = form.uf_allocation_expression;
-		soft_limit_expression = form.uf_soft_limit_expression;
-		hard_limit_expression = form.uf_hard_limit_expression;
-		service_model = form.uf_service_model;
-    }
-
-
-    if ( (resource_name.value == null) || (resource_name.value == "") || isblank(resource_name.value) )
-    {
-        errorMsg += 'Resource Name is required.<br>';
-    }
-    if ( (end_point_position.value == null) || (end_point_position.value == "") || isblank(end_point_position.value) )
-    {
-        errorMsg += 'End Point Position is required.<br>';
-    }
-    if ( (service_expression.value == null) || (service_expression.value == "") || isblank(service_expression.value) ){
-        errorMsg += 'Service Expression is required.<br>';
-    }
-    if ( (equipment_level.value == null) || (equipment_level.value == "") || isblank(equipment_level.value) ){
-        errorMsg += 'Equipment Level is required.<br>';
-    }
-    if ( (allocation_expression.value == null) || (allocation_expression.value == "") || isblank(allocation_expression.value) ){
-        errorMsg += 'Allocation Expression is required.<br>';
-    }
-    if ( (soft_limit_expression.value == null) || (soft_limit_expression.value == "") || isblank(soft_limit_expression.value) ){
-        errorMsg += 'Soft Limit Expression is required.<br>';
-    }
-    if ( (hard_limit_expression.value == null) || (hard_limit_expression.value == "") || isblank(hard_limit_expression.value) ){
-        errorMsg += 'Hard Limit Expression is required.<br>';
-    }
-    if ( (service_model.value == null) || (service_model.value == "") || isblank(service_model.value) ){
-        errorMsg += 'Service Model is required.<br>';
-    }
-    if( errorMsg.length > 0 ) {
-        bootbox.alert(errorMsg);
-        return;
-    }
-    form.submit();
-}
-
-function updateResourceRule(resource_rule_id,resource_name,end_point_position,service_expression,equipment_level,equipment_expression,allocation_expression,soft_limit_expression,hard_limit_expression,service_model) {
-
-    document.getElementById('uf_resource_rule_id').value=resource_rule_id;
-    document.getElementById('uf_resource_name').value=resource_name;
-    document.getElementById('uf_end_point_position').value=end_point_position;
-    document.getElementById('uf_service_expression').value=service_expression;
-    document.getElementById('uf_equipment_level').value=equipment_level;
-    document.getElementById('uf_equipment_expression').value=equipment_expression;
-    document.getElementById('uf_allocation_expression').value=allocation_expression;
-    document.getElementById('uf_soft_limit_expression').value=soft_limit_expression;
-    document.getElementById('uf_hard_limit_expression').value=hard_limit_expression;
-    document.getElementById('uf_service_model').value=service_model;
-    document.getElementById('uf_key_resource_rule_id').value=resource_rule_id;
-
-    $('#update_resource_rule').modal('show');
-}
-
-function deleteResourceRule(resource_rule_id) {
-
-    bootbox.confirm({
-        message: "Are you sure you want to delete RESOURCE_RULE [" + resource_rule_id + "]",
-        callback: function(result) {
-            if ( result )
-            {
-				location.assign("/resalloc/deleteResourceRule?resource_rule_id=" + resource_rule_id);
-            }
-            return;
-        },
-        buttons: {
-            cancel: {
-                label: "Cancel"
-            },
-            confirm: {
-                label: "Yes"
-            }
-        }
-    });
-}
-
-</script>
-
-</body>
-</html>
-
diff --git a/admportal/views/resalloc/threshold_alarms.ejs b/admportal/views/resalloc/threshold_alarms.ejs
deleted file mode 100644
index f561bc46..00000000
--- a/admportal/views/resalloc/threshold_alarms.ejs
+++ /dev/null
@@ -1,186 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#threshold_alarms').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>Threshold Alarms</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-		if (result.code.length > 0) { 
-			if ( result.code == 'success' ) { %>
-				<div class='alert alert-success' role='alert'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } else { %> 
-				<div class='alert alert-danger' role='danger'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } %>
-		<% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-
-	<% if (priv == 'A'){ %>
-		<div class="actions" style="padding:15px 0px;">
-    	<button class="btn btn-primary" data-toggle="modal" data-target="#add_threshold_alarm">
-      	Add Threshold Alarm
-    	</button>
-		</div>
-	<% } %>
-
-	<table id="threshold_alarms" class="table table-hover table-condensed">
-      <thead>
-        <tr>
-		  <th>*Resource Threshold ID</th>
-		  <th>*Resource Rule ID</th>
-          <th>Threshold Expression</th>
-		  <th>Threshold Message</th>
-		   <% if(priv == 'A'){ %>
-          <th>Action</th>
-          <% } %>
-        </tr>
-      </thead>
-      <tbody>
-      <% rows.forEach( function(row) { %> 
-        <tr>
-            <td><%= row.resource_threshold_id %></td>
-            <td><%= row.resource_rule_id %></td>
-            <td><%= row.threshold_expression %></td>
-            <td><%= row.threshold_message %></td>
-			<% if(priv == 'A') { %>
-            <td>
-				<button type="button" class="btn btn-default btn-xs"
-                    onclick="updateThresholdAlarm('<%= row.resource_threshold_id %>','<%=row.resource_rule_id %>','<%= row.threshold_expression %>','<%= row.threshold_message %>');">Update</button>
-				<button type="button" class="btn btn-default btn-xs"
-                   onclick="deleteThresholdAlarm('<%= row.resource_threshold_id %>');">Delete</button>
-            </td>
-            <% } %>
-
-        </tr>
-    <% }); %>
-      </tbody>
-    </table>
-
-</div>
-
-<% include ../partials/threshold_alarm %>
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-<script type="text/javascript">
-function submitThresholdAlarm(form)
-{
-    var resource_rule_id = '';
-	var threshold_expression = '';
-	var threshold_message = '';
-    var errorMsg = '';
-
-    if ( form.name == 'addForm' )
-    {
-		resource_rule_id = form.nf_resource_rule_id;
-		threshold_expression = form.nf_threshold_expression;
-		threshold_message = form.nf_threshold_message;
-    }
-    else
-    {
-		resource_rule_id = form.uf_resource_rule_id;
-		threshold_expression = form.uf_threshold_expression;
-		threshold_message = form.uf_threshold_message;
-    }
-    if ( (resource_rule_id.value == null) || (resource_rule_id.value == "") || isblank(resource_rule_id.value) )
-    {
-        errorMsg += 'Resource Rule ID is required.\n';
-    }
-    if ( (threshold_expression.value == null) || (threshold_expression.value == "") || isblank(threshold_expression.value) )
-    {
-        errorMsg += 'Threshold Expression is required.\n';
-    }
-    if ( (threshold_message.value == null) || (threshold_message.value == "") || isblank(threshold_message.value) )
-    {
-        errorMsg += 'Threshold Message is required.\n';
-    }
-    if( errorMsg.length > 0 ) {
-        alert(errorMsg);
-        return;
-    }
-
-    if ( !isDigit(resource_rule_id.value) )
-    {
-        alert('Resource Rule ID must be a number.');
-        return;
-    }
-
-    form.submit();
-}
-
-function updateThresholdAlarm(resource_threshold_id,resource_rule_id,threshold_expression,threshold_message) {
-
-    document.getElementById('uf_resource_threshold_id').value=resource_threshold_id;
-    document.getElementById('uf_resource_rule_id').value=resource_rule_id;
-    document.getElementById('uf_threshold_expression').value=threshold_expression;
-    document.getElementById('uf_threshold_message').value=threshold_message;
-
-    document.getElementById('uf_key_resource_threshold_id').value=resource_threshold_id;
-
-    $('#update_threshold_alarm').modal('show');
-}
-
-function deleteThresholdAlarm(resource_threshold_id) {
-
-    bootbox.confirm({
-        message: "Are you sure you want to delete Threshold Alarm [" + resource_threshold_id + "]",
-        callback: function(result) {
-            if ( result )
-            {
-				location.assign("/resalloc/deleteThresholdAlarm?resource_threshold_id=" + resource_threshold_id);
-            }
-            return;
-        },
-        buttons: {
-            cancel: {
-                label: "Cancel"
-            },
-            confirm: {
-                label: "Yes"
-            }
-        }
-    });
-}
-
-</script>
-
-</body>
-</html>
-
diff --git a/admportal/views/sdnfc/viewTables.ejs b/admportal/views/sdnfc/viewTables.ejs
deleted file mode 100644
index b950d8f9..00000000
--- a/admportal/views/sdnfc/viewTables.ejs
+++ /dev/null
@@ -1,102 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-
-<meta charset="UTF-8" />
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<% include ../partials/head %>
-<% include ../partials/header %>
-<script type="text/javascript" src="/javascripts/admportal.js" async></script>
-<title>SDN-FC AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#viewTables').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-</head>
-
-<body>
-
-<div class="well well-sm">
-<h3>View Database Tables
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-		if (result.code.length > 0) {
-            if ( result.code == 'success' ) { %>
-                <div class='alert alert-success' role='alert'>
-                <%
-                for ( x in result.msg ){ %>
-                    <div><%= result.msg[x] %></div>
-                <% } %>
-                </div>
-            <% } else { %>
-                <div class='alert alert-danger' role='danger'>
-                <%
-                for ( x in result.msg ){ %>
-                    <div><%= result.msg[x] %></div>
-                <% } %>
-                </div>
-            <% } %>
-        <% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-<!-- Single button -->
-<nav class="navbar navbar-default">
-<div class="container-fluid">
-<div class="navbar-header">
-
-<div class="btn-group">
-  <button type="button" class="btn btn-primary dropdown-toggle navbar-btn" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-    Table <span class="caret"></span>
-  </button>
-    <ul class="dropdown-menu" role="menu">
-    <% for ( var i in vtables ){ %>
-		<li><a href="/sdnfc/getTables?tableName=<%= vtables[i] %>"><%= vtables[i] %></a></li>
-	<% } %>
-    </ul>
-</div>
-</div>
-</div>
-</nav>
-
-<% if (displayTable) { %>
-<div class="container-fluid">
-    <table id="viewTables" class="table table-hover table-condensed">
-    <caption class="text-primary"><%= fields[0].table %></caption>
-    <thead>
-    <tr>
-	<% fields.forEach( function(field) { %>
-        <th><%= field.name %></th>
-        <% }); %>
-    </tr>
-    </thead>
-
-	<tbody>
-    <% for ( var x in rows ){ %>
-    <tr>
-        <% for ( var j in rows[x] ){ %>
-        <td><%= rows[x][j] %></td>
-        <% } %>
-    </tr>
-    <% } %>
-    </tbody>
-    </table>
-</div>
-<% } %>
-
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-</body>
-</html>
-
diff --git a/admportal/views/sdnfc/vrrCredentials.ejs b/admportal/views/sdnfc/vrrCredentials.ejs
deleted file mode 100644
index 85c9e956..00000000
--- a/admportal/views/sdnfc/vrrCredentials.ejs
+++ /dev/null
@@ -1,223 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-FC AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#vrr_credentials').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>VRR Credentials</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-		if (result.code.length > 0) { 
-			if ( result.code == 'success' ) { %>
-				<div class='alert alert-success' role='alert'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } else { %> 
-				<div class='alert alert-danger' role='danger'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } %>
-		<% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-
-	 <% if(priv == 'A'){ %>
-        <div class="actions" style="padding:15px 0px;">
-            <button class="btn btn-primary" data-toggle="modal" data-target="#add_vrr_credentials">
-           Add VRR Credentials 
-            </button>
-            </div>
-    <% } %>
-
-	<table id="vrr_CREDENTIALS" class="table table-hover table-condensed">
-      <thead>
-        <tr>
-          <th>*Server Name</th>
-          <th>*IP Address</th>
-          <th>*Username</th>
-          <th>*Password</th>
-		   <% if(priv == 'A'){ %>
-          <th>Action</th>
-          <% } %>
-        </tr>
-      </thead>
-      <tbody>
-      <% rows.forEach( function(row) { %> 
-        <tr>
-            <td><%= row.server_name %></td>
-            <td><%= row.ip_address %></td>
-            <td><%= row.username %></td>
-            <td>*****</td>
-			<% if(priv == 'A') { %>
-            <td>
-				<button type="button" class="btn btn-default btn-xs"
-						onclick="updateVrrCredentials('<%= row.server_name %>', '<%= row.ip_address %>', '<%= row.username %>','<%= row.password %>');">Update</button>
-				<button type="button" class="btn btn-default btn-xs"
-				onclick="deleteVrrCredentials('<%= row.server_name %>');">Delete</button>
-            </td>
-            <% } %>
-        </tr>
-    <% }); %>
-      </tbody>
-    </table>
-
-</div>
-
-<% include ../partials/vrr_credentials %>
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-<script type="text/javascript">
-function submitVrrCredentials(form)
-{
-    var errorMsg='';
-	var server_name = '';
-	var ip_address = '';
-	var username = '';
-	var password = '';
-	var confirm_password = '';
-
-    if ( form.name == 'addForm' )
-    {
-		server_name = form.nf_server_name;
-		ip_address = form.nf_ip_address;
-		username = form.nf_username;
-		password = form.nf_password;
-		confirm_password = form.nf_confirm_password;
-
-    	if ( (server_name.value == null) || (server_name.value == "") || isblank(server_name.value) )
-    	{
-        	errorMsg += 'Server Name is required.<br>';
-    	}
-    	if ( (ip_address.value == null) || (ip_address.value == "") || isblank(ip_address.value) )
-    	{
-        	errorMsg += 'IP Address is required.<br>';
-    	}
-    	if ( (password.value == null) || (password.value == "") || isblank(password.value) )
-    	{
-        	errorMsg += 'Password is required.<br>';
-    	}
-    	if ( (confirm_password.value == null) || (confirm_password.value == "") || isblank(confirm_password.value) )
-    	{
-        	errorMsg += 'Confirm Password is required.<br>';
-    	}
-    	if( errorMsg.length > 0 ) {
-        	bootbox.alert(errorMsg);
-        	return;
-    	}
-		if ( password.value != confirm_password.value )
-        {
-            bootbox.alert('Passwords do not match.');
-            return;
-        }
-    }
-    else
-    {
-		server_name = form.uf_server_name;
-		ip_address = form.uf_ip_address;
-		username = form.uf_username;
-		password = form.uf_password;
-		confirm_password = form.uf_confirm_password;
-
-		if ( (server_name.value == null) || (server_name.value == "") || isblank(server_name.value) )
-    	{
-        	errorMsg += 'Server Name is required.<br>';
-    	}
-    	if ( (ip_address.value == null) || (ip_address.value == "") || isblank(ip_address.value) )
-    	{
-        	errorMsg += 'IP Address is required.<br>';
-    	}
-    	if ( (password.value == null) || (password.value == "") || isblank(password.value) )
-    	{
-        	errorMsg += 'Password is required.<br>';
-    	}
-    	if ( (confirm_password.value == null) || (confirm_password.value == "") || isblank(confirm_password.value) )
-    	{
-        	errorMsg += 'Confirm Password is required.<br>';
-    	}
-    	if( errorMsg.length > 0 ) {
-        	bootbox.alert(errorMsg);
-        	return;
-    	}
-
-		if ( password.value != confirm_password.value )
-        {
-            bootbox.alert('Passwords do not match.');
-            return;
-        }
-    }
-    form.submit();
-}
-
-function updateVrrCredentials(server_name,ip_address,username,password) {
-
-    document.getElementById('uf_server_name').value=server_name;
-    document.getElementById('uf_key_server_name').value=server_name;
-    document.getElementById('uf_ip_address').value=ip_address;
-    document.getElementById('uf_username').value=username;
-    document.getElementById('uf_password').value=password;
-    document.getElementById('uf_confirm_password').value=password;
-
-    $('#update_vrr_credentials').modal('show');
-}
-
-function deleteVrrCredentials(server_name) {
-
-	var url_string = encodeURI("/sdnfc/deleteVrrCredentials?server_name=" + server_name); 
-
-    bootbox.confirm({
-        message: "Are you sure you want to delete VRR Credential [ " + server_name + " ]",
-        callback: function(result) {
-            if ( result )
-            {
-				location.assign(url_string);
-            }
-            return;
-        },
-        buttons: {
-            cancel: {
-                label: "Cancel"
-            },
-            confirm: {
-                label: "Yes"
-            }
-        }
-    });
-}
-
-</script>
-
-</body>
-</html>
-
diff --git a/admportal/views/sla/list.ejs b/admportal/views/sla/list.ejs
deleted file mode 100644
index 575e2066..00000000
--- a/admportal/views/sla/list.ejs
+++ /dev/null
@@ -1,183 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#sla').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>Service Logic Administration</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-		if (result.code.length > 0) { 
-			if ( result.code == 'success' ) { %>
-				<div class='alert alert-success' role='alert'><%=result.msg %></div>
-			<% } else { %>
-				<div class='alert alert-danger' role='danger'><%=result.msg %></div>
-			<% } %>
-		<% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else { 
-    var priv = 'A';
-} %>
-
-<div class="container-fluid">
-	<table id="sla" class="table table-hover table-condensed">
-	<thead>
-	<tr>
-		<th>Module</th>
-		<th>RPC</th>
-		<th>Version</th>
-		<th>Mode</th>
-		<th>Active</th>
-		<% if(priv == 'A') { %>
-		<th>Activate/Deactive</th>
-		<% } %>
-		<th>XML code</th>
-		<% if(priv=='A') { %>
-		<th>Delete</th>
-		<% } %>
-	</tr>
-	</thead>
-	<tbody>
-	<% var i=0; rows.forEach( function(row) { %> 
-	<tr>
-		<td><%= row.module %></td>
-		<td><%= row.rpc %></td>
-		<td><%= row.version %></td>
-		<td><%= row.mode %></td>
-		<td><%= row.active %></td>
-		<% if ( priv == 'A' ) { 
-			if (row.active == "Y") { %>
-		<td><button type="button" class="btn btn-default btn-xs" onclick="toggleState('deactivate','<%= row.module %>','<%= row.rpc %>','<%= row.version %>','<%= row.mode %>');" >Deactivate</button> </td>
-		<% } else { %>
-		<td><button type="button" class="btn btn-default btn-xs" onclick="toggleState('activate','<%= row.module %>','<%= row.rpc %>','<%= row.version %>','<%= row.mode %>');" >Activate</button></td>
-		<% } %>
-		<% } %>
-		<td>
-			<button type="button" class="btn btn-default btn-xs"
-				onclick='location.assign("/sla/printAsXml?module=<%= row.module %>&rpc=<%= row.rpc %>&version=<%= row.version %>&mode=<%= row.mode %>");'>XML code</button>
-		</td>
-		<% if ( priv == 'A' ) { %>
-		<td>
-			<button type="button" class="btn btn-default btn-xs"
-				onclick="deleteGraph('<%=row.module %>',
-				'<%=row.rpc %>', '<%=row.version %>','<%=row.mode %>');">Delete</button>
-		</td>
-		<% } %>
-	</tr>
-	<% i++; }); %>
-	</tbody>
-	</table>
-
-	<% if(priv == 'A') { %>
-	<div class="actions" style="padding:0px 25px;">
-	<form method="POST" action="/sla/upload" enctype="multipart/form-data">
-		<div class="form-group">
-			<label for="dest">File input</label>
-			<input name="filename" type="file" id="dest" />
-			<input type="hidden" name="_csrf" value="<%= privilege.csrfToken %>" />
-			<p class="help-block">Choose a file to upload.</p>
-		</div>
-		<% if ( priv == 'A' ) { %>
-		<button type="button" class="btn btn-default"
-			onclick="uploadFile(this.form);">Upload File</button>
-		<% } else { %>
-		<button type="button" class="btn btn-default disabled"
-			onclick="uploadFile(this.form);">Upload File</button>
-		<% } %>
-	</form>
-	</div>
-	<% } %>
-
-</div>
-
-
-
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-<script type="text/javascript">
-function deleteGraph(_module,rpc,version,mode) {
-
-	bootbox.confirm({
-        message: "Are you sure you want to delete Directed Graph [" + _module + "][" + rpc + "][" + version + "] ?",
-        callback: function(result) {
-            if ( result )
-            {
-        		location.assign("/sla/deleteDG?module=" + _module 
-					+ "&rpc=" + rpc + "&version=" + version + "&mode=" + mode );
-            }
-            return;
-        },
-        buttons: {
-            cancel: {
-                label: "Cancel"
-            },
-            confirm: {
-                label: "Yes"
-            }
-        }
-    });
-}
-function toggleState(laction,_module,rpc,version,mode)
-{
-	var myprompt = '';
-	var myaction = '';
-	if(laction == 'activate'){
-		myprompt = "Are you sure you want to Activate Directed Graph [" + _module + "] ?";
-        myaction = "/sla/activate"
-			+ "?module=" + _module
-			+ "&rpc=" + rpc 
-			+ "&version=" + version
-			+ "&mode=" + mode;
-	} else {
-		myprompt = "Are you sure you want to Deactivate Directed Graph [" + _module + "] ?";
-		myaction = "/sla/deactivate"
-			+ "?module=" + _module
-			+ "&rpc=" + rpc 
-			+ "&version=" + version
-			+ "&mode=" + mode;
-	}
-		
-	bootbox.confirm({
-        message: myprompt,
-        callback: function(result) {
-            if ( result )
-            {
-                location.assign(myaction);
-            }
-            return;
-        },
-        buttons: {
-            cancel: {
-                label: "Cancel"
-            },
-            confirm: {
-                label: "Yes"
-            }
-        }
-    });
-}
-</script>
-</body>
-</html>
-
diff --git a/admportal/views/sla/printasgv.ejs b/admportal/views/sla/printasgv.ejs
deleted file mode 100644
index 66dca131..00000000
--- a/admportal/views/sla/printasgv.ejs
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <title>SDN-C AdminPortal</title>
-  <meta charset="utf-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-</head>
-<body>
-
-
-
-<div class="well well-sm">
-<h3>Service Logic Graph</h3>
-</div>
-
-<div class="container-fluid">
-<% if ( typeof result != 'undefined' ) {
-        if (result.code.length > 0) {
-            if ( result.code == 'success' ) { %>
-<pre>
-Module  : <%= result.module %>
-RPC     : <%= result.rpc %>
-Mode    : <%= result.mode %>
-Version : <%= result.version %>
-<br>
-<img src='data:image/png;base64,<%= result.msg %>' >
-</pre>
-            <% } else { %>
-                <pre class='alert alert-danger' role='danger'><%=result.msg %></pre>
-            <% } %>
-        <% } %>
-<% } %>
-
-
-<footer>
-	 <% include ../partials/footer %>
-</footer>
-    
-</body>
-</html>
-
diff --git a/admportal/views/sla/printasxml.ejs b/admportal/views/sla/printasxml.ejs
deleted file mode 100644
index 48b55049..00000000
--- a/admportal/views/sla/printasxml.ejs
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <title>SDN-C AdminPortal</title>
-  <meta charset="UTF-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>Service Logic Code</h3>
-</div>
-
-<div class="container-fluid">
-<% if ( typeof result != 'undefined' ) {
-        if (result.code.length > 0) {
-            if ( result.code == 'success' ) { %>
-                <pre class='alert alert-success' role='alert'><%=result.msg %></pre>
-            <% } else { %>
-                <pre class='alert alert-danger' role='danger'><%=result.msg %></pre>
-            <% } %>
-        <% } %>
-<% } %>
-</div>
-
-
-<footer>
-	 <% include ../partials/footer %>
-</footer>
-    
-</body>
-</html>
-
diff --git a/admportal/views/tunnel/linkLatencyMaster.ejs b/admportal/views/tunnel/linkLatencyMaster.ejs
deleted file mode 100644
index c09adc4e..00000000
--- a/admportal/views/tunnel/linkLatencyMaster.ejs
+++ /dev/null
@@ -1,240 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-
-<meta charset="UTF-8" />
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<% include ../partials/head %>
-<% include ../partials/header %>
-<script type="text/javascript" src="/javascripts/admportal.js" async></script>
-<title>SDNC-MLC AdminPortal</title>
-
-
-<script class="init"> 
-	$(document).ready(function() {
-    $('#linkLatencyMaster').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-</head>
-
-<body>
-
-<div class="well well-sm">
-<h3>Link Latency Master</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-		if (result.code.length > 0) { 
-			if ( result.code == 'success' ) { %>
-				<div class='alert alert-success' role='alert'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } else { %> 
-				<div class='alert alert-danger' role='danger'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } %>
-		<% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-
-	<% if(priv == 'A'){ %>
-        <div class="actions" style="padding:15px 0px;">
-            <button class="btn btn-primary btn-md" data-toggle="modal" data-target="#add_link_latency_master">Add Link Latency</button>
-        </div>
-    <% } %>
-
-	<table id="linkLatencyMaster" class="table table-hover table-condensed">
-      <thead>
-        <tr>
-		  <th>*Src CRS Name</th>
-		  <th>*Dest CRS Name</th>
-          <th>*Bundle Name</th>
-		  <th>*Latency</th>
-		  <th>*Intra Inter SNRC</th>
-          <th>*Final Latency</th>
-          <th>*Augmentable</th>
-		   <% if(priv == 'A'){ %>
-          <th>Action</th>
-          <% } %>
-        </tr>
-      </thead>
-      <tbody>
-      <% rows.forEach( function(row) { %> 
-        <tr>
-            <td><%= row.source_crs_name %></td>
-            <td><%= row.destination_crs_name %></td>
-            <td><%= row.bundle_name %></td>
-            <td><%= row.latency %></td>
-            <td><%= row.intra_inter_snrc %></td>
-            <td><%= row.final_latency %></td>
-            <td><%= row.augmentable %></td>
-			<% if(priv == 'A') { %>
-            <td>
-				<button type="button" class="btn btn-default btn-xs" onclick="updateLinkLatencyMaster('<%= row.source_crs_name %>', '<%= row.destination_crs_name %>', '<%= row.bundle_name %>', '<%= row.latency %>', '<%= row.intra_inter_snrc %>', '<%= row.final_latency %>', '<%= row.augmentable %>');">Update</button>
-                <button type="button" class="btn btn-default btn-xs" onclick="deleteLinkLatencyMaster('<%= row.source_crs_name %>','<%= row.destination_crs_name %>','<%= row.bundle_name %>');">Delete</button>
-            </td>
-            <% } %>
-        </tr>
-    <% }); %>
-      </tbody>
-    </table>
-
-    <% if(priv == 'A'){ %>
-    <div class="actions" style="padding:0px 25px;">
-        <form method="POST" action="/tunnel/uploadLinkLatencyMaster" enctype="multipart/form-data">
-        <div class="form-group">
-            <label for="dest">File input</label>
-            <input name="filename" type="file" id="dest">
-            <p class="help-block">Choose a file to upload.</p>
-        </div>
-        <button type="button" class="btn btn-default" onclick="uploadFile(this.form);">Upload File</button>
-        </form>
-    </div>
-    <% } %>
-
-</div>
-
-<% include ../partials/link_latency_master %>
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-<script type="text/javascript">
-function submitLinkLatencyMaster(form)
-{
-    var errorMsg='';
-    var source_crs_name = '';
-    var destination_crs_name = '';
-	var bundle_name = '';
-	var latency = '';
-	var intra_inter_snrc = '';
-    var final_latency = '';
-    var augmentable = '';
-
-    if ( form.name == 'addForm' )
-    {
-		source_crs_name = form.nf_source_crs_name;
-		destination_crs_name = form.nf_destination_crs_name;
-		bundle_name = form.nf_bundle_name;
-		latency = form.nf_latency;
-		intra_inter_snrc = form.nf_intra_inter_snrc;
-        final_latency = form.nf_final_latency;
-        augmentable = form.nf_augmentable;
-    }
-    else
-    {
-		source_crs_name = form.uf_source_crs_name;
-		destination_crs_name = form.uf_destination_crs_name;
-		bundle_name = form.uf_bundle_name;
-		latency = form.uf_latency;
-		intra_inter_snrc = form.uf_intra_inter_snrc;
-        final_latency = form.uf_final_latency;
-        augmentable = form.uf_augmentable;
-    }
-
-    if ( (source_crs_name.value == null) || (source_crs_name.value == "") || isblank(source_crs_name.value) )
-    {
-        errorMsg += 'Source CRS Name is required.<br>';
-    }
-    if ( (destination_crs_name.value == null) || (destination_crs_name.value == "") || isblank(destination_crs_name.value) )
-    {
-        errorMsg += 'Destination CRS Name is required.<br>';
-    }
-    if ( (bundle_name.value == null) || (bundle_name.value == "") || isblank(bundle_name.value) )
-    {
-        errorMsg += 'Bundle Name is required.<br>';
-    }
-    if ( (latency.value == null) || (latency.value == "") || isblank(latency.value) )
-    {
-        errorMsg += 'Latency is required.<br>';
-    }
-    if ( (intra_inter_snrc.value == null) || (intra_inter_snrc.value == "") || isblank(intra_inter_snrc.value) )
-    {
-        errorMsg += 'Intra Inter SNRC is required.<br>';
-    }
-    if ( (final_latency.value == null) || (final_latency.value == "") || isblank(final_latency.value) )
-    {
-        errorMsg += 'Final Latency is required.<br>';
-    }
-    if ( (augmentable.value == null) || (augmentable.value == "") || isblank(augmentable.value) )
-    {
-        errorMsg += 'Augmentable is required.<br>';
-    }
-    if( errorMsg.length > 0 ) {
-        bootbox.alert(errorMsg);
-        return;
-    }
-
-    if (augmentable.value != 'Y' && augmentable.value != 'N'){
-        bootbox.alert('Augmentable must be Y or N');
-        return;
-    }
-
-    form.submit();
-}
-
-function updateLinkLatencyMaster(source_crs_name,destination_crs_name,bundle_name,latency,intra_inter_snrc,final_latency,augmentable) {
-
-    document.getElementById('uf_source_crs_name').value=source_crs_name;
-    document.getElementById('uf_destination_crs_name').value=destination_crs_name;
-    document.getElementById('uf_bundle_name').value=bundle_name;
-    document.getElementById('uf_latency').value=latency;
-    document.getElementById('uf_intra_inter_snrc').value=intra_inter_snrc;
-    document.getElementById('uf_final_latency').value=final_latency;
-    document.getElementById('uf_augmentable').value=augmentable;
-
-    document.getElementById('uf_key_source_crs_name').value=source_crs_name;
-    document.getElementById('uf_key_destination_crs_name').value=destination_crs_name;
-    document.getElementById('uf_key_bundle_name').value=bundle_name;
-
-    $('#update_link_latency_master').modal('show');
-}
-
-function deleteLinkLatencyMaster(source_crs_name,destination_crs_name,bundle_name) {
-
-	var url_string = encodeURI("/tunnel/deleteLinkLatencyMaster?source_crs_name=" + source_crs_name
-            + "&destination_crs_name=" + destination_crs_name
-            + "&bundle_name=" + bundle_name);
-
-    bootbox.confirm({
-        message: "Are you sure you want to delete this Link Latency entry? [" + source_crs_name + ":" + destination_crs_name + ":" + bundle_name + "]",
-        callback: function(result) {
-            if ( result )
-            {
-				location.assign(url_string);
-            }
-            return;
-        },
-        buttons: {
-            cancel: {
-                label: "Cancel"
-            },
-            confirm: {
-                label: "Yes"
-            }
-        }
-    });
-}
-
-</script>
-
-</body>
-</html>
-
diff --git a/admportal/views/tunnel/linkMaster.ejs b/admportal/views/tunnel/linkMaster.ejs
deleted file mode 100644
index 160bb7e6..00000000
--- a/admportal/views/tunnel/linkMaster.ejs
+++ /dev/null
@@ -1,213 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-
-<meta charset="UTF-8" />
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<% include ../partials/head %>
-<% include ../partials/header %>
-<script type="text/javascript" src="/javascripts/admportal.js" async></script>
-<title>SDNC-MLC AdminPortal</title>
-
-
-<script class="init"> 
-	$(document).ready(function() {
-    $('#linkMaster').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-</head>
-
-<body>
-
-<div class="well well-sm">
-<h3>Link Master</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-		if (result.code.length > 0) { 
-			if ( result.code == 'success' ) { %>
-				<div class='alert alert-success' role='alert'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } else { %> 
-				<div class='alert alert-danger' role='danger'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } %>
-		<% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-
-	<% if(priv == 'A'){ %>
-        <div class="actions" style="padding:15px 0px;">
-            <button class="btn btn-primary btn-md" data-toggle="modal" data-target="#add_link_master">Add Link</button>
-        </div>
-    <% } %>
-
-	<table id="linkMaster" class="table table-hover table-condensed">
-      <thead>
-        <tr>
-		  <th>*Link Interface IP</th>
-          <th>Source CRS Name</th>
-		  <th>Destination CRS Name</th>
-		  <th>Max Reserved BW</th>
-		  <th>Default Cost</th>
-		  <th>Bundle Name</th>
-		  <th>Shutdown</th>
-		   <% if(priv == 'A'){ %>
-          <th>Action</th>
-          <% } %>
-        </tr>
-      </thead>
-      <tbody>
-      <% rows.forEach( function(row) { %> 
-        <tr>
-            <td><%= row.link_interface_ip %></td>
-            <td><%= row.source_crs_name %></td>
-            <td><%= row.destination_crs_name %></td>
-            <td><%= row.link_speed %></td>
-            <td><%= row.default_cost %></td>
-            <td><%= row.bundle_name %></td>
-			<td><%= row.shutdown %></td>
-			<% if(priv == 'A') { %>
-            <td>
-				<button type="button" class="btn btn-default btn-xs" onclick="updateLinkMaster('<%= row.link_interface_ip %>', 
-					'<%= row.source_crs_name %>', '<%= row.destination_crs_name %>', '<%= row.link_speed %>', '<%= row.default_cost %>',
-					'<%= row.bundle_name %>', '<%= row.shutdown %>');">Update</button>
-				<button type="button" class="btn btn-default btn-xs" onclick="deleteLinkMaster('<%= row.link_interface_ip %>');">Delete</button>
-            </td>
-            <% } %>
-        </tr>
-    <% }); %>
-      </tbody>
-    </table>
-</div>
-
-<% include ../partials/link_master %>
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-<script type="text/javascript">
-function saveLinkMaster(form)
-{
-    var errorMsg='';
-    var link_interface_ip = '';
-	var source_crs_name = '';
-	var destination_crs_name = '';
-	var link_speed = '';
-	var default_cost = '';
-	var bundle_name = '';
-	var shutdown = '';
-
-    if ( form.name == 'addForm' )
-    {
-		link_interface_ip = form.nf_link_interface_ip;
-		source_crs_name = form.nf_source_crs_name;
-		destination_crs_name = form.nf_destination_crs_name;
-		link_speed = form.nf_link_speed;
-		default_cost = form.nf_default_cost;
-		bundle_name = form.nf_bundle_name;
-		shutdown = form.nf_shutdown;
-    }
-    else
-    {
-		link_interface_ip = form.uf_link_interface_ip;
-		source_crs_name = form.uf_source_crs_name;
-		destination_crs_name = form.uf_destination_crs_name;
-		link_speed = form.uf_link_speed;
-		default_cost = form.uf_default_cost;
-		bundle_name = form.uf_bundle_name;
-		shutdown = form.uf_shutdown;
-    }
-
-
-    if ( (link_interface_ip.value == null) || (link_interface_ip.value == "") || isblank(link_interface_ip.value) )
-    {
-        errorMsg += 'Link Interface IP is required.<br>';
-    }
-    if ( (source_crs_name.value == null) || (source_crs_name.value == "") || isblank(source_crs_name.value) )
-    {
-        errorMsg += 'Source CRS Name is required.<br>';
-    }
-    if ( (destination_crs_name.value == null) || (destination_crs_name.value == "") || isblank(destination_crs_name.value) )
-    {
-        errorMsg += 'Destination CRS Name is required.<br>';
-    }
-    if( errorMsg.length > 0 ) {
-        bootbox.alert(errorMsg);
-        return;
-    }
-
-	if ( link_speed.value.length >0 && !isDigit(link_speed.value) )
-    {
-        bootbox.alert('Max Reserved BW must be a number.');
-        return;
-    }
-	if ( default_cost.value.length >0 && !isDigit(default_cost.value) )
-    {
-        bootbox.alert('Default Cost must be a number.');
-        return;
-    }
-    form.submit();
-}
-
-function updateLinkMaster(link_interface_ip,source_crs_name,destination_crs_name,link_speed,default_cost,bundle_name,shutdown) {
-
-    document.getElementById('uf_link_interface_ip').value=link_interface_ip;
-    document.getElementById('uf_source_crs_name').value=source_crs_name;
-    document.getElementById('uf_destination_crs_name').value=destination_crs_name;
-    document.getElementById('uf_link_speed').value=link_speed;
-    document.getElementById('uf_default_cost').value=default_cost;
-    document.getElementById('uf_bundle_name').value=bundle_name;
-    document.getElementById('uf_shutdown').value=shutdown;
-    document.getElementById('uf_key_link_interface_ip').value=link_interface_ip;
-
-    $('#update_link_master').modal('show');
-}
-
-function deleteLinkMaster(link_interface_ip) {
-
-	var url_string = encodeURI("/tunnel/deleteLinkMaster?link_interface_ip=" + link_interface_ip);
-
-    bootbox.confirm({
-        message: "Are you sure you want to delete this Link [" + link_interface_ip + "]",
-        callback: function(result) {
-            if ( result )
-            {
-				location.assign(url_string);
-            }
-            return;
-        },
-        buttons: {
-            cancel: {
-                label: "Cancel"
-            },
-            confirm: {
-                label: "Yes"
-            }
-        }
-    });
-}
-
-</script>
-
-</body>
-</html>
-
diff --git a/admportal/views/tunnel/metroRoadmServiceRequest.ejs b/admportal/views/tunnel/metroRoadmServiceRequest.ejs
deleted file mode 100644
index efc81afe..00000000
--- a/admportal/views/tunnel/metroRoadmServiceRequest.ejs
+++ /dev/null
@@ -1,300 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#metroRoadmServiceRequest').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>Metro ROADM Service Request</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-		if (result.code.length > 0) { 
-			if ( result.code == 'success' ) { %>
-				<div class='alert alert-success' role='alert'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } else { %> 
-				<div class='alert alert-danger' role='danger'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } %>
-		<% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-
-    <!--
-	 <% if(priv == 'A'){ %>
-        <div class="actions" style="padding:15px 0px;">
-            <button class="btn btn-primary" data-toggle="modal" data-target="#add_metroroadm_service_request">
-            Add Metro ROADM Serice Request
-            </button>
-            </div>
-    <% } %>
-    -->
-
-	<table id="metroRoadmServiceRequest" class="table table-hover table-condensed">
-      <thead>
-        <tr>
-		   <th>ReqId</th>
-		   <th>ReqSource</th>
-		   <th>NotificationURL</th>
-		   <th>Action</th>
-          <th>ReqTimestamp</th>
-          <th>UpdateTimestamp</th>
-          <th>ReqStatus</th>
-          <th>ProcStatus</th>
-          <th>ReasonCode</th>
-          <th>ReasonMsg</th>
-          <th>ServiceId</th>
-          <th>CommonId</th>
-          <th>Clli_A</th>
-          <th>Clli_Z</th>
-          <th>Customer</th>
-          <th>ControllerId</th>
-		   <% if(priv == 'A'){ %>
-          <th>Action</th>
-          <% } %>
-        </tr>
-      </thead>
-      <tbody>
-      <% rows.forEach( function(row) { %> 
-        <tr>
-            <td><%= row.request_id %></td>
-            <td><%= row.request_source %></td>
-            <td><%= row.notification_url %></td>
-            <td><%= row.action %></td>
-            <td><%= row.request_timestamp %></td>
-            <td><%= row.update_timestamp %></td>
-            <td><%= row.request_status %></td>
-            <td><%= row.processing_status %></td>
-            <td><%= row.reason_code %></td>
-            <td><%= row.reason_message %></td>
-            <td><%= row.service_id %></td>
-            <td><%= row.common_id %></td>
-            <td><%= row.clli_a %></td>
-            <td><%= row.clli_z %></td>
-            <td><%= row.customer %></td>
-            <td><%= row.controller_id %></td>
-			<% if(priv == 'A') { %>
-            <td>
-				<button type="button" class="btn btn-default btn-xs"
-                onclick="updateMetroRoadmServiceRequest('<%=row.request_id %>','<%= row.request_source %>',
-                    '<%=row.notification_url %>','<%= row.action %>','<%= row.request_timestamp %>',
-                    '<%= row.update_timestamp %>','<%= row.request_status %>', '<%= row.processing_status %>',
-                    '<%= row.reason_code %>', '<%= row.reason_message %>','<%= row.service_id %>',
-                    '<%= row.common_id %>','<%= row.clli_a %>', '<%= row.clli_z %>','<%= row.customer %>',
-                    '<%= row.controller_id %>');">Update</button>
-				<button type="button" class="btn btn-default btn-xs"
-				onclick="deleteMetroRoadmServiceRequest('<%= row.request_id %>');">Delete</button>
-            </td>
-            <% } %>
-        </tr>
-    <% }); %>
-      </tbody>
-    </table>
-</div>
-
-<% include ../partials/metroroadm_service_request %>
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-<script type="text/javascript">
-function submitMetroRoadmServiceRequest(form)
-{
-    var errorMsg='';
-    var request_id='';
-	var request_source = '';
-	var notification_url = '';
-	var action = '';
-	var request_timestamp = '';
-	var update_timestamp = '';
-	var request_status = '';
-	var processing_status = '';
-	var reason_code = '';
-	var reason_message = '';
-	var service_id = '';
-	var common_id = '';
-	var clli_a = '';
-	var clli_z = '';
-	var customer = '';
-	var controller_id = '';
-
-    if ( form.name == 'addForm' )
-    {
-		request_id = form.nf_request_id;
-		request_source = form.nf_request_source;
-		notification_url = form.nf_notification_url;
-		action = form.nf_l_action;
-		request_timestamp = form.nf_request_timestamp;
-		update_timestamp = form.nf_update_timestamp;
-		request_status = form.nf_request_status;
-		processing_status = form.nf_processing_status;
-		reason_code = form.nf_reason_code;
-		reason_message = form.nf_reason_message;
-		service_id = form.nf_service_id;
-		common_id = form.nf_common_id;
-		clli_a = form.nf_clli_a;
-		clli_z = form.nf_clli_z;
-		customer = form.nf_customer;
-		controller_id = form.nf_controller_id;
-    }
-    else
-    {
-		request_id = form.uf_request_id;
-		request_source = form.uf_request_source;
-		notification_url = form.uf_notification_url;
-		action = form.uf_l_action;
-		request_timestamp = form.uf_request_timestamp;
-		update_timestamp = form.uf_update_timestamp;
-		request_status = form.uf_request_status;
-		processing_status = form.uf_processing_status;
-		reason_code = form.uf_reason_code;
-		reason_message = form.uf_reason_message;
-		service_id = form.uf_service_id;
-		common_id = form.uf_common_id;
-		clli_a = form.uf_clli_a;
-		clli_z = form.uf_clli_z;
-		customer = form.uf_customer;
-		controller_id = form.uf_controller_id;
-    }
-    if ( (request_id.value == null) || (request_id.value == "") || isblank(request_id.value) )
-    {
-        errorMsg += 'Request Id is required.\n';
-    }
-    if ( (action.value == null) || (action.value == "") || isblank(action.value) )
-    {
-        errorMsg += 'Action is required.\n';
-    }
-    if ( (request_timestamp.value == null) || (request_timestamp.value == "") || isblank(request_timestamp.value) )
-    {
-        errorMsg += 'Request Timestamp is required.\n';
-    }
-    if ( (request_status.value == null) || (request_status.value == "") || isblank(request_status.value) )
-    {
-        errorMsg += 'Request Status is required.\n';
-    }
-    if ( (processing_status.value == null) || (processing_status.value == "") || isblank(processing_status.value) )
-    {
-        errorMsg += 'Processing Status is required.\n';
-    }
-    if ( (service_id.value == null) || (service_id.value == "") || isblank(service_id.value) )
-    {
-        errorMsg += 'Service Id is required.\n';
-    }
-    if ( (controller_id.value == null) || (controller_id.value == "") || isblank(controller_id.value) )
-    {
-        errorMsg += 'Controller Id is required.\n';
-    }
-    if( errorMsg.length > 0 ) {
-        alert(errorMsg);
-        return;
-    }
-
-    // edit request_timestamp, update_timestamp
-    if (!isValid(request_timestamp.value)){ 
-        alert('Request Timestamp must be in format YYYY-MM-DD HH:MM:SS');
-        return;
-    }
-    if ( update_timestamp.length > 0 )
-    {
-        if (!isValid(update_timestamp.value)){ 
-            alert('Update Timestamp must be in format YYYY-MM-DD HH:MM:SS');
-            return;
-        }
-    }
-    form.submit();
-}
-
-function isValid(dateString) {
-    if (dateString == '0000-00-00 00:00:00'){
-        return(true);
-    }
-    var minDate = new Date('1970-01-01 00:00:01');
-    var maxDate = new Date('2038-01-19 03:14:07');
-    var date = new Date(dateString);
-    return date > minDate && date < maxDate;
-}
-
-function updateMetroRoadmServiceRequest(request_id,request_source,notification_url,action,request_timestamp,update_timestamp,
-        request_status,processing_status,reason_code,reason_message,service_id,common_id,clli_a,clli_z,customer,controller_id) {
-
-    document.getElementById('uf_request_id').value=request_id;
-    document.getElementById('uf_key_request_id').value=request_id;
-    document.getElementById('uf_request_source').value=request_source;
-    document.getElementById('uf_notification_url').value=notification_url;
-    document.getElementById('uf_l_action').value=action;
-    document.getElementById('uf_request_timestamp').value=request_timestamp;
-    document.getElementById('uf_update_timestamp').value=update_timestamp;
-    document.getElementById('uf_request_status').value=request_status;
-    document.getElementById('uf_processing_status').value=processing_status;
-    document.getElementById('uf_reason_code').value=reason_code;
-    document.getElementById('uf_reason_message').value=reason_message;
-    document.getElementById('uf_service_id').value=service_id;
-    document.getElementById('uf_common_id').value=common_id;
-    document.getElementById('uf_clli_a').value=clli_a;
-    document.getElementById('uf_clli_z').value=clli_z;
-    document.getElementById('uf_customer').value=customer;
-    document.getElementById('uf_controller_id').value=controller_id;
-
-    $('#update_metroroadm_service_request').modal('show');
-}
-
-function deleteMetroRoadmServiceRequest(request_id) {
-
-	var url_string = encodeURI("/tunnel/deleteMetroRoadmServiceRequest?request_id=" + request_id );
-
-    bootbox.confirm({
-        message: "Are you sure you want to delete Metro ROADM Service Request? " + request_id,
-        callback: function(result) {
-            if ( result )
-            {
-				location.assign(url_string);
-            }
-            return;
-        },
-        buttons: {
-            cancel: {
-                label: "Cancel"
-            },
-            confirm: {
-                label: "Yes"
-            }
-        }
-    });
-}
-
-</script>
-
-</body>
-</html>
-
diff --git a/admportal/views/tunnel/owbcProperties.ejs b/admportal/views/tunnel/owbcProperties.ejs
deleted file mode 100644
index 37b02fea..00000000
--- a/admportal/views/tunnel/owbcProperties.ejs
+++ /dev/null
@@ -1,223 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#owbc_properties').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>OWBC Properties</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-		if (result.code.length > 0) { 
-			if ( result.code == 'success' ) { %>
-				<div class='alert alert-success' role='alert'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } else { %> 
-				<div class='alert alert-danger' role='danger'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } %>
-		<% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-
-	 <% if(priv == 'A'){ %>
-        <div class="actions" style="padding:15px 0px;">
-            <button class="btn btn-primary" data-toggle="modal" data-target="#add_owbc_properties">
-            Add OWBC Properties
-            </button>
-            </div>
-    <% } %>
-
-	<table id="owbc_properties" class="table table-hover table-condensed">
-      <thead>
-        <tr>
-		   <th>Controller ID</th>
-		   <th>Base URL</th>
-		   <th>Service Create Extension</th>
-		   <th>Service Delete Extension</th>
-          <th>Auth Username</th>
-          <th>Auth Password</th>
-		   <% if(priv == 'A'){ %>
-          <th>Action</th>
-          <% } %>
-        </tr>
-      </thead>
-      <tbody>
-      <% rows.forEach( function(row) { %> 
-        <tr>
-            <td><%= row.controller_id %></td>
-            <td><%= row.base_uri %></td>
-            <td><%= row.service_create_extension %></td>
-            <td><%= row.service_delete_extension %></td>
-            <td><%= row.auth_username %></td>
-            <td>*****</td>
-			<% if(priv == 'A') { %>
-            <td>
-				<button type="button" class="btn btn-default btn-xs"
-                onclick="updateOwbcProperties('<%=row.controller_id %>','<%= row.base_uri %>','<%= row.service_create_extension %>','<%= row.service_delete_extension %>','<%= row.auth_username %>','<%= row.auth_password %>');">Update</button>
-				<button type="button" class="btn btn-default btn-xs"
-				onclick="deleteOwbcProperties('<%= row.controller_id %>');">Delete</button>
-            </td>
-            <% } %>
-
-        </tr>
-    <% }); %>
-      </tbody>
-    </table>
-
-</div>
-
-<% include ../partials/owbc_properties %>
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-<script type="text/javascript">
-function submitOwbcProperties(form)
-{
-    var errorMsg='';
-	var controller_id = '';
-	var base_uri = '';
-	var service_create_extension = '';
-	var service_delete_extension = '';
-	var auth_username = '';
-	var auth_password = '';
-	var confirm_auth_password = '';
-
-    if ( form.name == 'addForm' )
-    {
-		controller_id = form.nf_controller_id;
-		base_uri = form.nf_base_uri;
-		service_create_extension = form.nf_service_create_extension;
-		service_delete_extension = form.nf_service_delete_extension;
-		auth_username = form.nf_auth_username;
-		auth_password = form.nf_auth_password;
-		confirm_auth_password = form.nf_confirm_auth_password;
-
-		if ( auth_password.value != confirm_auth_password.value )
-		{
-			bootbox.alert('Passwords do not match.');
-			return;
-		}
-    }
-    else
-    {
-		controller_id = form.uf_controller_id;
-		base_uri = form.uf_base_uri;
-		service_create_extension = form.uf_service_create_extension;
-		service_delete_extension = form.uf_service_delete_extension;
-		auth_username = form.uf_auth_username;
-		auth_password = form.uf_auth_password;
-		confirm_auth_password = form.uf_confirm_auth_password;
-
-		if ( auth_password.value != confirm_auth_password.value )
-		{
-			bootbox.alert('Passwords do not match.');
-			return;
-		}
-    }
-    if ( (controller_id.value == null) || (controller_id.value == "") || isblank(controller_id.value) )
-    {
-        errorMsg += 'Controller Id is required.<br>';
-    }
-    if ( (base_uri.value == null) || (base_uri.value == "") || isblank(base_uri.value) )
-    {
-        errorMsg += 'Base URL is required.<br>';
-    }
-    if ( (service_create_extension.value == null) || (service_create_extension.value == "") || isblank(service_create_extension.value) )
-    {
-        errorMsg += 'Service Create Extension is required.<br>';
-    }
-    if ( (service_delete_extension.value == null) || (service_delete_extension.value == "") || isblank(service_delete_extension.value) )
-    {
-        errorMsg += 'Service Delete Extension is required.<br>';
-    }
-    if ( (auth_username.value == null) || (auth_username.value == "") || isblank(auth_username.value) )
-    {
-        errorMsg += 'Auth Username is required.<br>';
-    }
-    if ( (auth_password.value == null) || (auth_password.value == "") || isblank(auth_password.value) )
-    {
-        errorMsg += 'Auth Password is required.<br>';
-    }
-    if( errorMsg.length > 0 ) {
-        bootbox.alert(errorMsg);
-        return;
-    }
-    form.submit();
-}
-
-function updateOwbcProperties(controller_id,base_uri,service_create_extension,service_delete_extension,auth_username,auth_password) {
-
-    document.getElementById('uf_controller_id').value=controller_id;
-    document.getElementById('uf_key_controller_id').value=controller_id;
-    document.getElementById('uf_base_uri').value=base_uri;
-    document.getElementById('uf_service_create_extension').value=service_create_extension;
-    document.getElementById('uf_service_delete_extension').value=service_delete_extension;
-    document.getElementById('uf_auth_username').value=auth_username;
-    document.getElementById('uf_auth_password').value=auth_password;
-    document.getElementById('uf_confirm_auth_password').value=auth_password;
-
-    $('#update_owbc_properties').modal('show');
-}
-
-function deleteOwbcProperties(controller_id) {
-
-	var url_string = encodeURI("/tunnel/deleteOwbcProperties?controller_id=" + controller_id );
-
-    bootbox.confirm({
-        message: "Are you sure you want to delete OWBC Properties? " + controller_id,
-        callback: function(result) {
-            if ( result )
-            {
-				location.assign(url_string);
-            }
-            return;
-        },
-        buttons: {
-            cancel: {
-                label: "Cancel"
-            },
-            confirm: {
-                label: "Yes"
-            }
-        }
-    });
-}
-
-</script>
-
-</body>
-</html>
-
diff --git a/admportal/views/tunnel/partnerProperties.ejs b/admportal/views/tunnel/partnerProperties.ejs
deleted file mode 100644
index af51c864..00000000
--- a/admportal/views/tunnel/partnerProperties.ejs
+++ /dev/null
@@ -1,184 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDNC-MLC AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#partner_properties').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>Partner Properties</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-		if (result.code.length > 0) { 
-			if ( result.code == 'success' ) { %>
-				<div class='alert alert-success' role='alert'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } else { %> 
-				<div class='alert alert-danger' role='danger'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } %>
-		<% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-
-	 <% if(priv == 'A'){ %>
-        <div class="actions" style="padding:15px 0px;">
-            <button class="btn btn-primary" data-toggle="modal" data-target="#add_partner_properties">
-           Add Partner Properties 
-            </button>
-            </div>
-    <% } %>
-
-	<table id="partner_properties" class="table table-hover table-condensed">
-      <thead>
-        <tr>
-          <th>*Partner</th>
-          <th>*Username</th>
-          <th>*Password</th>
-		   <% if(priv == 'A'){ %>
-          <th>Action</th>
-          <% } %>
-        </tr>
-      </thead>
-      <tbody>
-      <% rows.forEach( function(row) { %> 
-        <tr>
-            <td><%= row.partner %></td>
-            <td><%= row.auth_username %></td>
-            <td>*****</td>
-			<% if(priv == 'A') { %>
-            <td>
-				<button type="button" class="btn btn-default btn-xs"
-                onclick="updatePartnerProperties('<%= row.partner %>','<%= row.auth_username %>','<%= row.auth_password %>');">Update</button>
-				<button type="button" class="btn btn-default btn-xs"
-				onclick="deletePartnerProperties('<%= row.partner %>');">Delete</button>
-            </td>
-            <% } %>
-
-        </tr>
-    <% }); %>
-      </tbody>
-    </table>
-
-</div>
-
-<% include ../partials/partner_properties %>
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-<script type="text/javascript">
-function submitPartnerProperties(form)
-{
-    var errorMsg='';
-	var partner = '';
-	var auth_username = '';
-	var auth_password = '';
-	var confirm_auth_password = '';
-
-    if ( form.name == 'addForm' )
-    {
-		partner = form.nf_partner;
-		auth_username = form.nf_auth_username;
-		auth_password = form.nf_auth_password;
-		confirm_auth_password = form.nf_confirm_auth_password;
-
-    	if ( (partner.value == null) || (partner.value == "") || isblank(partner.value) )
-    	{
-        	errorMsg += 'Partner is required.<br>';
-    	}
-    	if( errorMsg.length > 0 ) {
-        	bootbox.alert(errorMsg);
-        	return;
-    	}
-		if ( auth_password.value != confirm_auth_password.value )
-        {
-            bootbox.alert('Passwords do not match.');
-            return;
-        }
-    }
-    else
-    {
-		partner = form.uf_partner;
-		auth_username = form.uf_auth_username;
-		auth_password = form.uf_auth_password;
-		confirm_auth_password = form.uf_confirm_auth_password;
-		if ( auth_password.value != confirm_auth_password.value )
-        {
-            bootbox.alert('Passwords do not match.');
-            return;
-        }
-    }
-    form.submit();
-}
-
-function updatePartnerProperties(partner,auth_username,auth_password) {
-
-    document.getElementById('uf_partner').value=partner;
-    document.getElementById('uf_key_partner').value=partner;
-    document.getElementById('uf_auth_username').value=auth_username;
-    document.getElementById('uf_auth_password').value=auth_password;
-    document.getElementById('uf_confirm_auth_password').value=auth_password;
-
-    $('#update_partner_properties').modal('show');
-}
-
-function deletePartnerProperties(partner) {
-
-	var url_string = encodeURI("/tunnel/deletePartnerProperties?partner=" + partner); 
-
-    bootbox.confirm({
-        message: "Are you sure you want to delete Partner Property [ " + partner + " ]",
-        callback: function(result) {
-            if ( result )
-            {
-				location.assign(url_string);
-            }
-            return;
-        },
-        buttons: {
-            cancel: {
-                label: "Cancel"
-            },
-            confirm: {
-                label: "Yes"
-            }
-        }
-    });
-}
-
-</script>
-
-</body>
-</html>
-
diff --git a/admportal/views/tunnel/roadmMapping.ejs b/admportal/views/tunnel/roadmMapping.ejs
deleted file mode 100644
index 347cf03e..00000000
--- a/admportal/views/tunnel/roadmMapping.ejs
+++ /dev/null
@@ -1,230 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-
-<meta charset="UTF-8" />
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<% include ../partials/head %>
-<% include ../partials/header %>
-<script type="text/javascript" src="/javascripts/admportal.js" async></script>
-<title>SDNC-MLC AdminPortal</title>
-
-
-<script class="init"> 
-	$(document).ready(function() {
-    $('#roadmMapping').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-</head>
-
-<body>
-
-<div class="well well-sm">
-<h3>ROADM Mapping</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-		if (result.code.length > 0) { 
-			if ( result.code == 'success' ) { %>
-				<div class='alert alert-success' role='alert'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } else { %> 
-				<div class='alert alert-danger' role='danger'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } %>
-		<% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-
-	<% if(priv == 'A'){ %>
-        <div class="actions" style="padding:15px 0px;">
-            <button class="btn btn-primary btn-md" data-toggle="modal" data-target="#add_roadm_mapping">Add Mapping</button>
-        </div>
-    <% } %>
-
-	<table id="roadmMapping" class="table table-hover table-condensed">
-      <thead>
-        <tr>
-		  <th>*Router Name</th>
-          <th>*ROADM Name</th>
-          <th>*CLLI</th>
-          <th>*City Name</th>
-		  <th>*LAT</th>
-		  <th>*LON</th>
-		  <th>*SNRC</th>
-		   <% if(priv == 'A'){ %>
-          <th>Action</th>
-          <% } %>
-        </tr>
-      </thead>
-      <tbody>
-      <% rows.forEach( function(row) { %> 
-        <tr>
-            <td><%= row.router_name %></td>
-            <td><%= row.roadm_name %></td>
-            <td><%= row.clli %></td>
-            <td><%= row.city_name %></td>
-            <td><%= row.lat %></td>
-            <td><%= row.lon %></td>
-            <td><%= row.snrc %></td>
-			<% if(priv == 'A') { %>
-            <td>
-				<button type="button" class="btn btn-default btn-xs" onclick="updateRoadmMapping('<%= row.router_name %>', 
-                    '<%= row.roadm_name %>', '<%= row.clli %>', '<%= row.city_name %>', '<%= row.lat %>', '<%= row.lon %>', '<%= row.snrc %>');">Update</button>
-				<button type="button" class="btn btn-default btn-xs" onclick="deleteRoadmMapping('<%= row.router_name %>');">Delete</button>
-            </td>
-            <% } %>
-        </tr>
-    <% }); %>
-      </tbody>
-    </table>
-
-    <% if(priv == 'A'){ %>
-    <div class="actions" style="padding:0px 25px;">
-        <form method="POST" action="/tunnel/uploadRoadmMapping" enctype="multipart/form-data">
-        <div class="form-group">
-            <label for="dest">File input</label>
-            <input name="filename" type="file" id="dest">
-            <p class="help-block">Choose a file to upload.</p>
-        </div>
-        <button type="button" class="btn btn-default" onclick="uploadFile(this.form);">Upload File</button>
-        </form>
-    </div>
-    <% } %>
-
-</div>
-
-<% include ../partials/roadm_mapping %>
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-<script type="text/javascript">
-function saveRoadmMapping(form)
-{
-    var errorMsg='';
-    var router_name = '';
-	var roadm_name = '';
-	var clli = '';
-	var city_name = '';
-	var lat = '';
-	var lon = '';
-	var snrc = '';
-
-    if ( form.name == 'addForm' )
-    {
-		router_name = form.nf_router_name;
-		roadm_name = form.nf_roadm_name;
-		clli = form.nf_clli;
-		city_name = form.nf_city_name;
-		lat = form.nf_lat;
-		lon = form.nf_lon;
-		snrc = form.nf_snrc;
-    }
-    else
-    {
-		router_name = form.uf_router_name;
-		roadm_name = form.uf_roadm_name;
-		clli = form.uf_clli;
-		city_name = form.uf_city_name;
-		lat = form.uf_lat;
-		lon = form.uf_lon;
-		snrc = form.uf_snrc;
-    }
-
-    if ( (router_name.value == null) || (router_name.value == "") || isblank(router_name.value) )
-    {
-        errorMsg += 'Router Name is required.<br>';
-    }
-    if ( (roadm_name.value == null) || (roadm_name.value == "") || isblank(roadm_name.value) )
-    {
-        errorMsg += 'ROADM Name is required.<br>';
-    }
-    if ( (clli.value == null) || (clli.value == "") || isblank(clli.value) )
-    {
-        errorMsg += 'CLLI is required.<br>';
-    }
-    if ( (city_name.value == null) || (city_name.value == "") || isblank(city_name.value) )
-    {
-        errorMsg += 'City Name is required.<br>';
-    }
-    if ( (lat.value == null) || (lat.value == "") || isblank(lat.value) )
-    {
-        errorMsg += 'LAT (latitude) is required.<br>';
-    }
-    if ( (lon.value == null) || (lon.value == "") || isblank(lon.value) )
-    {
-        errorMsg += 'LON (longitude) is required.<br>';
-    }
-    if ( (snrc.value == null) || (snrc.value == "") || isblank(snrc.value) )
-    {
-        errorMsg += 'SNRC is required.<br>';
-    }
-    if( errorMsg.length > 0 ) {
-        bootbox.alert(errorMsg);
-        return;
-    }
-    form.submit();
-}
-
-function updateRoadmMapping(router_name,roadm_name,clli,city_name,lat,lon,snrc) {
-
-    document.getElementById('uf_router_name').value=router_name;
-    document.getElementById('uf_roadm_name').value=roadm_name;
-    document.getElementById('uf_clli').value=clli;
-    document.getElementById('uf_city_name').value=city_name;
-    document.getElementById('uf_lat').value=lat;
-    document.getElementById('uf_lon').value=lon;
-    document.getElementById('uf_snrc').value=snrc;
-    document.getElementById('uf_key_router_name').value=router_name;
-
-    $('#update_roadm_mapping').modal('show');
-}
-
-function deleteRoadmMapping(router_name) {
-
-	var url_string = encodeURI("/tunnel/deleteRoadmMapping?router_name=" + router_name);
-
-    bootbox.confirm({
-        message: "Are you sure you want to delete this mapping? [" + router_name + "]",
-        callback: function(result) {
-            if ( result )
-            {
-				location.assign(url_string);
-            }
-            return;
-        },
-        buttons: {
-            cancel: {
-                label: "Cancel"
-            },
-            confirm: {
-                label: "Yes"
-            }
-        }
-    });
-}
-
-</script>
-
-</body>
-</html>
-
diff --git a/admportal/views/tunnel/routerMaster.ejs b/admportal/views/tunnel/routerMaster.ejs
deleted file mode 100644
index eada3f39..00000000
--- a/admportal/views/tunnel/routerMaster.ejs
+++ /dev/null
@@ -1,167 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-
-<meta charset="UTF-8" />
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<% include ../partials/head %>
-<% include ../partials/header %>
-<script type="text/javascript" src="/javascripts/admportal.js" async></script>
-<title>SDN-C AdminPortal</title>
-
-
-<script class="init"> 
-	$(document).ready(function() {
-    $('#routerMaster').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-</head>
-
-<body>
-
-<div class="well well-sm">
-<h3>Router Master</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-		if (result.code.length > 0) { 
-			if ( result.code == 'success' ) { %>
-				<div class='alert alert-success' role='alert'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } else { %> 
-				<div class='alert alert-danger' role='danger'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } %>
-		<% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-
-	<% if(priv == 'A'){ %>
-        <div class="actions" style="padding:15px 0px;">
-            <button class="btn btn-primary btn-md" data-toggle="modal" data-target="#add_router_master">Add Router</button>
-        </div>
-    <% } %>
-
-	<table id="routerMaster" class="table table-hover table-condensed">
-      <thead>
-        <tr>
-		  <th>*CRS Name</th>
-          <th>Loopback IP</th>
-		   <% if(priv == 'A'){ %>
-          <th>Action</th>
-          <% } %>
-        </tr>
-      </thead>
-      <tbody>
-      <% rows.forEach( function(row) { %> 
-        <tr>
-            <td><%= row.crs_name %></td>
-            <td><%= row.loopback_ip %></td>
-			<% if(priv == 'A') { %>
-            <td>
-				<button type="button" class="btn btn-default btn-xs" onclick="updateRouterMaster('<%= row.crs_name %>', 
-					'<%= row.loopback_ip %>');">Update</button>
-				<button type="button" class="btn btn-default btn-xs" onclick="deleteRouterMaster('<%= row.crs_name %>');">Delete</button>
-            </td>
-            <% } %>
-        </tr>
-    <% }); %>
-      </tbody>
-    </table>
-</div>
-
-<% include ../partials/router_master %>
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-<script type="text/javascript">
-function saveRouterMaster(form)
-{
-    var errorMsg='';
-    var crs_name = '';
-	var loopback_ip = '';
-
-    if ( form.name == 'addForm' )
-    {
-		crs_name = form.nf_crs_name;
-		loopback_ip = form.nf_loopback_ip;
-    }
-    else
-    {
-		crs_name = form.uf_crs_name;
-		loopback_ip = form.uf_loopback_ip;
-    }
-
-
-    if ( (crs_name.value == null) || (crs_name.value == "") || isblank(crs_name.value) )
-    {
-        errorMsg += 'CRS Name is required.<br>';
-    }
-    if ( (loopback_ip.value == null) || (loopback_ip.value == "") || isblank(loopback_ip.value) )
-    {
-        errorMsg += 'Loopback IP is required.<br>';
-    }
-    if( errorMsg.length > 0 ) {
-        bootbox.alert(errorMsg);
-        return;
-    }
-    form.submit();
-}
-
-function updateRouterMaster(crs_name,loopback_ip) {
-
-    document.getElementById('uf_crs_name').value=crs_name;
-    document.getElementById('uf_loopback_ip').value=loopback_ip;
-    document.getElementById('uf_key_crs_name').value=crs_name;
-
-    $('#update_router_master').modal('show');
-}
-
-function deleteRouterMaster(crs_name) {
-
-	var url_string = encodeURI("/tunnel/deleteRouterMaster?crs_name=" + crs_name);
-
-    bootbox.confirm({
-        message: "Are you sure you want to delete this Router [" + crs_name + "]",
-        callback: function(result) {
-            if ( result )
-            {
-				location.assign(url_string);
-            }
-            return;
-        },
-        buttons: {
-            cancel: {
-                label: "Cancel"
-            },
-            confirm: {
-                label: "Yes"
-            }
-        }
-    });
-}
-
-</script>
-
-</body>
-</html>
-
diff --git a/admportal/views/ucpe/altsCredentials.ejs b/admportal/views/ucpe/altsCredentials.ejs
deleted file mode 100644
index 54ca0208..00000000
--- a/admportal/views/ucpe/altsCredentials.ejs
+++ /dev/null
@@ -1,171 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#alts_credentials').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>ALTS Credentials</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-		if (result.code.length > 0) { 
-			if ( result.code == 'success' ) { %>
-				<div class='alert alert-success' role='alert'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } else { %> 
-				<div class='alert alert-danger' role='danger'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } %>
-		<% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-
-	 <% if(priv == 'A'){ %>
-        <div class="actions" style="padding:15px 0px;">
-            <button class="btn btn-primary" data-toggle="modal" data-target="#add_alts_credentials">
-            Add ALTS Credentials
-            </button>
-            </div>
-    <% } %>
-
-	<table id="alts_credentials" class="table table-hover table-condensed">
-      <thead>
-        <tr>
-          <th>ALTS Username</th>
-          <th>ALTS Password</th>
-		   <% if(priv == 'A'){ %>
-          <th>Action</th>
-          <% } %>
-        </tr>
-      </thead>
-      <tbody>
-      <% rows.forEach( function(row) { %> 
-        <tr>
-            <td><%= row.alts_username %></td>
-            <td>*****</td>
-			<% if(priv == 'A') { %>
-            <td>
-				<button type="button" class="btn btn-default btn-xs"
-                onclick="updateAltsCredentials('<%=row.alts_username %>','<%= row.alts_password %>');">Update</button>
-				<button type="button" class="btn btn-default btn-xs"
-				onclick="deleteAltsCredentials('<%= row.alts_username %>', '<%= row.alts_password %>');">Delete</button>
-            </td>
-            <% } %>
-
-        </tr>
-    <% }); %>
-      </tbody>
-    </table>
-
-</div>
-
-<% include ../partials/alts_credentials %>
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-<script type="text/javascript">
-function submitAltsCredentials(form)
-{
-    var errorMsg='';
-	var alts_username = '';
-	var alts_password = '';
-	var confirm_alts_password = '';
-
-    if ( form.name == 'addForm' )
-    {
-		alts_username = form.nf_alts_username;
-		alts_password = form.nf_alts_password;
-		confirm_alts_password = form.nf_confirm_alts_password;
-
-		if ( alts_password.value != confirm_alts_password.value )
-		{
-			bootbox.alert('Passwords do not match.');
-			return;
-		}
-    }
-    else
-    {
-		alts_username = form.uf_alts_username;
-		alts_password = form.uf_alts_password;
-		confirm_alts_password = form.uf_confirm_alts_password;
-
-		if ( alts_password.value != confirm_alts_password.value )
-		{
-			bootbox.alert('Passwords do not match.');
-			return;
-		}
-    }
-    form.submit();
-}
-
-function updateAltsCredentials(alts_username,alts_password) {
-
-    document.getElementById('uf_alts_username').value=alts_username;
-    document.getElementById('uf_alts_password').value=alts_password;
-
-    $('#update_alts_credentials').modal('show');
-}
-
-function deleteAltsCredentials(alts_username, alts_password) {
-
-	var url_string = encodeURI("/ucpe/deleteAltsCredentials?alts_username=" + alts_username 
-					+ "&alts_password=" + alts_password);
-
-
-    bootbox.confirm({
-        message: "Are you sure you want to delete ALTS Credentials? " + alts_username,
-        callback: function(result) {
-            if ( result )
-            {
-				location.assign(url_string);
-            }
-            return;
-        },
-        buttons: {
-            cancel: {
-                label: "Cancel"
-            },
-            confirm: {
-                label: "Yes"
-            }
-        }
-    });
-}
-
-</script>
-
-</body>
-</html>
-
diff --git a/admportal/views/ucpe/apiLogins.ejs b/admportal/views/ucpe/apiLogins.ejs
deleted file mode 100644
index ddb50c8b..00000000
--- a/admportal/views/ucpe/apiLogins.ejs
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#api_logins').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-
-<body>
-
-<div class="well well-sm">
-<h3>uCPE API Logins</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-        if (result.code.length > 0) {
-            if ( result.code == 'success' ) { %>
-                <div class='alert alert-success' role='alert'>
-                <%
-                for ( x in result.msg ){ %>
-                    <div><%= result.msg[x] %></div>
-                <% } %>
-                </div>
-            <% } else { %>
-                <div class='alert alert-danger' role='danger'>
-                <%
-                for ( x in result.msg ){ %>
-                    <div><%= result.msg[x] %></div>
-                <% } %>
-                </div>
-            <% } %>
-        <% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-
-<!--
-	 <% if (priv == 'A'){ %>
-    <div class="actions" style="padding:15px 0px;">
-    <button class="btn btn-primary" data-toggle="modal" data-target="#add_vnf_profile">
-      Add VNF Profile
-    </button>
-    </div>
-    <% } %>
--->
-
-	<table id="api_logins" class="table table-hover table-condensed">
-    <thead>
-        <tr>
-		  <th>*CUSTOMER_NAME</th>
-		  <th>PHS_NCS_USERNAME</th>
-		  <th>NCS_PUBLIC_SSH_KEY</th>
-        </tr>
-    </thead>
-	<tbody>
-    <% rows.forEach( function(row) { %>
-        <tr>
-            <td><%= row.customer_name %></td>
-            <td><%= row.phs_ncs_username %></td>
-            <td><%= row.ncs_public_ssh_key %></td>
-        </tr>
-    <% }); %>
-    </tbody>
-    </table>
-
-</div>
-
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-
-</body>
-</html>
-
diff --git a/admportal/views/ucpe/chainingTopologies.ejs b/admportal/views/ucpe/chainingTopologies.ejs
deleted file mode 100644
index 2717062a..00000000
--- a/admportal/views/ucpe/chainingTopologies.ejs
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#chaining_topologies').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>uCPE Chaining Topologies</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-        if (result.code.length > 0) {
-            if ( result.code == 'success' ) { %>
-                <div class='alert alert-success' role='alert'>
-                <%
-                for ( x in result.msg ){ %>
-                    <div><%= result.msg[x] %></div>
-                <% } %>
-                </div>
-            <% } else { %>
-                <div class='alert alert-danger' role='danger'>
-                <%
-                for ( x in result.msg ){ %>
-                    <div><%= result.msg[x] %></div>
-                <% } %>
-                </div>
-            <% } %>
-        <% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-
-<!--
-	 <% if (priv == 'A'){ %>
-    <div class="actions" style="padding:15px 0px;">
-    <button class="btn btn-primary" data-toggle="modal" data-target="#add_vnf_profile">
-      Add VNF Profile
-    </button>
-    </div>
-    <% } %>
--->
-
-	<table id="chaining_topologies" class="table table-hover table-condensed">
-    <thead>
-        <tr>
-		  <th>*TOPOLOGY_NAME</th>
-		  <th>*START_VNF_TYPE</th>
-		  <th>*SEQUENCE_NUMBER</th>
-		  <th>START_SERVIVE_PORT_NAME</th>
-		  <th>VNF_TYPE</th>
-		  <th>SERVICE_PORT_NAME</th>
-        </tr>
-    </thead>
-	<tbody>
-    <% rows.forEach( function(row) { %>
-        <tr>
-            <td><%= row.topology_name %></td>
-            <td><%= row.start_vnf_type %></td>
-            <td><%= row.sequence_number %></td>
-            <td><%= row.start_service_port_name %></td>
-            <td><%= row.vnf_type %></td>
-            <td><%= row.service_port_name %></td>
-        </tr>
-    <% }); %>
-    </tbody>
-    </table>
-
-</div>
-
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-
-</body>
-</html>
-
diff --git a/admportal/views/ucpe/customerNcsServers.ejs b/admportal/views/ucpe/customerNcsServers.ejs
deleted file mode 100644
index 082384a8..00000000
--- a/admportal/views/ucpe/customerNcsServers.ejs
+++ /dev/null
@@ -1,102 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#ncs_servers').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>uCPE Customer NCS Servers</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-        if (result.code.length > 0) {
-            if ( result.code == 'success' ) { %>
-                <div class='alert alert-success' role='alert'>
-                <%
-                for ( x in result.msg ){ %>
-                    <div><%= result.msg[x] %></div>
-                <% } %>
-                </div>
-            <% } else { %>
-                <div class='alert alert-danger' role='danger'>
-                <%
-                for ( x in result.msg ){ %>
-                    <div><%= result.msg[x] %></div>
-                <% } %>
-                </div>
-            <% } %>
-        <% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-
-<!--
-	 <% if (priv == 'A'){ %>
-    <div class="actions" style="padding:15px 0px;">
-    <button class="btn btn-primary" data-toggle="modal" data-target="#add_vnf_profile">
-      Add VNF Profile
-    </button>
-    </div>
-    <% } %>
--->
-
-	<table id="ncs_servers" class="table table-hover table-condensed">
-    <thead>
-        <tr>
-		  <th>*CUSTOMER_NAME</th>
-		  <th>URL</th>
-		  <th>NCS_SM_IP_ADDRESS</th>
-		  <th>NCS_DM_V6_IP_ADDRESS</th>
-		  <th>NCS_DM_V6_IP_NETWORK</th>
-		  <th>DR_NCS_DM_V6_IP_NETWORK</th>
-		  <th>NCS_DM_V4_IP_NETWORK</th>
-		  <th>DR_NCS_DM_V4_IP_NETWORK</th>
-        </tr>
-    </thead>
-	<tbody>
-    <% rows.forEach( function(row) { %>
-        <tr>
-            <td><%= row.customer_name %></td>
-            <td><%= row.url %></td>
-            <td><%= row.ncs_sm_ip_address %></td>
-            <td><%= row.ncs_dm_v6_ip_address %></td>
-            <td><%= row.ncs_dm_v6_ip_network %></td>
-            <td><%= row.dr_ncs_dm_v6_ip_network %></td>
-            <td><%= row.ncs_dm_v4_ip_network %></td>
-            <td><%= row.dr_ncs_dm_v4_ip_network %></td>
-        </tr>
-    <% }); %>
-    </tbody>
-    </table>
-
-</div>
-
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-
-</body>
-</html>
-
diff --git a/admportal/views/ucpe/mappedServicePort.ejs b/admportal/views/ucpe/mappedServicePort.ejs
deleted file mode 100644
index 1c55eb5c..00000000
--- a/admportal/views/ucpe/mappedServicePort.ejs
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#mapped_service_port').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>uCPE Mapped Service Port</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-        if (result.code.length > 0) {
-            if ( result.code == 'success' ) { %>
-                <div class='alert alert-success' role='alert'>
-                <%
-                for ( x in result.msg ){ %>
-                    <div><%= result.msg[x] %></div>
-                <% } %>
-                </div>
-            <% } else { %>
-                <div class='alert alert-danger' role='danger'>
-                <%
-                for ( x in result.msg ){ %>
-                    <div><%= result.msg[x] %></div>
-                <% } %>
-                </div>
-            <% } %>
-        <% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-
-<!--
-	 <% if (priv == 'A'){ %>
-    <div class="actions" style="padding:15px 0px;">
-    <button class="btn btn-primary" data-toggle="modal" data-target="#add_vnf_profile">
-      Add VNF Profile
-    </button>
-    </div>
-    <% } %>
--->
-
-	<table id="mapped_service_port" class="table table-hover table-condensed">
-    <thead>
-        <tr>
-		  <th>*DEVICE_VENDOR_NAME</th>
-		  <th>*DEVICE_MODEL</th>
-		  <th>*SERVICE_PORT_NAME</th>
-		  <th>*VNF_VENDOR_NAME</th>
-		  <th>*VNF_MODEL</th>
-		  <th>*PORT_NAME</th>
-        </tr>
-    </thead>
-	<tbody>
-    <% rows.forEach( function(row) { %>
-        <tr>
-            <td><%= row.device_vendor_name %></td>
-            <td><%= row.device_model %></td>
-            <td><%= row.service_port_name %></td>
-            <td><%= row.vnf_vendor_name %></td>
-            <td><%= row.vnf_model %></td>
-            <td><%= row.port_name %></td>
-        </tr>
-    <% }); %>
-    </tbody>
-    </table>
-
-</div>
-
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-
-</body>
-</html>
-
diff --git a/admportal/views/ucpe/mcapServers.ejs b/admportal/views/ucpe/mcapServers.ejs
deleted file mode 100644
index a51abd09..00000000
--- a/admportal/views/ucpe/mcapServers.ejs
+++ /dev/null
@@ -1,92 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#mcap_servers').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>uCPE MCAP Servers</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-        if (result.code.length > 0) {
-            if ( result.code == 'success' ) { %>
-                <div class='alert alert-success' role='alert'>
-                <%
-                for ( x in result.msg ){ %>
-                    <div><%= result.msg[x] %></div>
-                <% } %>
-                </div>
-            <% } else { %>
-                <div class='alert alert-danger' role='danger'>
-                <%
-                for ( x in result.msg ){ %>
-                    <div><%= result.msg[x] %></div>
-                <% } %>
-                </div>
-            <% } %>
-        <% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-
-<!--
-	 <% if (priv == 'A'){ %>
-    <div class="actions" style="padding:15px 0px;">
-    <button class="btn btn-primary" data-toggle="modal" data-target="#add_vnf_profile">
-      Add VNF Profile
-    </button>
-    </div>
-    <% } %>
--->
-
-	<table id="mcap_servers" class="table table-hover table-condensed">
-    <thead>
-        <tr>
-		  <th>*CUSTOMER_NAME</th>
-		  <th>*MCAP_IP_ADDRESS</th>
-		  <th>*MCAP_POLLER_IP_ADDRESS</th>
-        </tr>
-    </thead>
-	<tbody>
-    <% rows.forEach( function(row) { %>
-        <tr>
-            <td><%= row.customer_name %></td>
-            <td><%= row.mcap_ip_address %></td>
-            <td><%= row.mcap_poller_ip_address %></td>
-        </tr>
-    <% }); %>
-    </tbody>
-    </table>
-
-</div>
-
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-
-</body>
-</html>
-
diff --git a/admportal/views/ucpe/ncsCredentials.ejs b/admportal/views/ucpe/ncsCredentials.ejs
deleted file mode 100644
index f860b075..00000000
--- a/admportal/views/ucpe/ncsCredentials.ejs
+++ /dev/null
@@ -1,180 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#ncs_server_credentials').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>NCS Server Credentials</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-		if (result.code.length > 0) { 
-			if ( result.code == 'success' ) { %>
-				<div class='alert alert-success' role='alert'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } else { %> 
-				<div class='alert alert-danger' role='danger'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } %>
-		<% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-
-	 <% if(priv == 'A'){ %>
-        <div class="actions" style="padding:15px 0px;">
-            <button class="btn btn-primary" data-toggle="modal" data-target="#add_ncs_credentials">
-            Add NCS Credentials
-            </button>
-            </div>
-    <% } %>
-
-	<table id="ncs_server_credentials" class="table table-hover table-condensed">
-      <thead>
-        <tr>
-          <th>*Customer Name</th>
-          <th>NCS Username</th>
-          <th>NCS Password</th>
-		   <% if(priv == 'A'){ %>
-          <th>Action</th>
-          <% } %>
-        </tr>
-      </thead>
-      <tbody>
-      <% rows.forEach( function(row) { %> 
-        <tr>
-            <td><%= row.customer_name %></td>
-            <td><%= row.ncs_username %></td>
-            <td>*****</td>
-			<% if(priv == 'A') { %>
-            <td>
-				<button type="button" class="btn btn-default btn-xs"
-                onclick="updateNcsCredentials('<%= row.customer_name %>','<%= row.ncs_username %>','<%= row.ncs_password %>');">Update</button>
-				<button type="button" class="btn btn-default btn-xs"
-				onclick="deleteNcsCredentials('<%= row.customer_name %>');">Delete</button>
-            </td>
-            <% } %>
-
-        </tr>
-    <% }); %>
-      </tbody>
-    </table>
-
-</div>
-
-<% include ../partials/ncs_credentials %>
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-<script type="text/javascript">
-function submitNcsCredentials(form)
-{
-    var errorMsg='';
-	var customer_name = '';
-	var ncs_username = '';
-	var ncs_password = '';
-	var confirm_ncs_password = '';
-
-    if ( form.name == 'addForm' )
-    {
-		customer_name = form.nf_customer_name;
-		ncs_username = form.nf_ncs_username;
-		ncs_password = form.nf_ncs_password;
-		confirm_ncs_password = form.nf_confirm_ncs_password;
-
-    	if ( (customer_name.value == null) || (customer_name.value == "") || isblank(customer_name.value) )
-    	{
-        	errorMsg += 'Customer Name is required.<br>';
-    	}
-    	if( errorMsg.length > 0 ) {
-        	bootbox.alert(errorMsg);
-        	return;
-    	}
-		if ( ncs_password.value != confirm_ncs_password.value )
-        {
-            bootbox.alert('Passwords do not match.');
-            return;
-        }
-    }
-    else
-    {
-		customer_name = form.uf_customer_name;
-		ncs_username = form.uf_ncs_username;
-		ncs_password = form.uf_ncs_password;
-		confirm_ncs_password = form.uf_confirm_ncs_password;
-		if ( ncs_password.value != confirm_ncs_password.value )
-        {
-            bootbox.alert('Passwords do not match.');
-            return;
-        }
-    }
-    form.submit();
-}
-
-function updateNcsCredentials(customer_name,ncs_username,ncs_password) {
-
-    document.getElementById('uf_customer_name').value=customer_name;
-    document.getElementById('uf_ncs_username').value=ncs_username;
-    document.getElementById('uf_ncs_password').value=ncs_password;
-
-    $('#update_ncs_credentials').modal('show');
-}
-
-function deleteNcsCredentials(customer_name) {
-
-    bootbox.confirm({
-        message: "Are you sure you want to delete NCS Credentials [ " + customer_name + " ]",
-        callback: function(result) {
-            if ( result )
-            {
-				location.assign("/ucpe/deleteNcsCredentials?customer_name=" + customer_name); 
-            }
-            return;
-        },
-        buttons: {
-            cancel: {
-                label: "Cancel"
-            },
-            confirm: {
-                label: "Yes"
-            }
-        }
-    });
-}
-
-</script>
-
-</body>
-</html>
-
diff --git a/admportal/views/ucpe/nmInterfaces.ejs b/admportal/views/ucpe/nmInterfaces.ejs
deleted file mode 100644
index 50b15c4b..00000000
--- a/admportal/views/ucpe/nmInterfaces.ejs
+++ /dev/null
@@ -1,96 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#nm_interfaces').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>uCPE NM Interfaces</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-        if (result.code.length > 0) {
-            if ( result.code == 'success' ) { %>
-                <div class='alert alert-success' role='alert'>
-                <%
-                for ( x in result.msg ){ %>
-                    <div><%= result.msg[x] %></div>
-                <% } %>
-                </div>
-            <% } else { %>
-                <div class='alert alert-danger' role='danger'>
-                <%
-                for ( x in result.msg ){ %>
-                    <div><%= result.msg[x] %></div>
-                <% } %>
-                </div>
-            <% } %>
-        <% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-
-<!--
-	 <% if (priv == 'A'){ %>
-    <div class="actions" style="padding:15px 0px;">
-    <button class="btn btn-primary" data-toggle="modal" data-target="#add_vnf_profile">
-      Add VNF Profile
-    </button>
-    </div>
-    <% } %>
--->
-
-	<table id="nm_interfaces" class="table table-hover table-condensed">
-    <thead>
-        <tr>
-		  <th>*DEVICE_VENDOR_NAME</th>
-		  <th>*DEVICE_MODEL</th>
-		  <th>NM_VLAN_NUMBER</th>
-		  <th>DEVICE_MANAGER_NM_LAN_INTERFACE</th>
-		  <th>SWITCH_MANAGER_NM_LAN_INTERFACE</th>
-        </tr>
-    </thead>
-	<tbody>
-    <% rows.forEach( function(row) { %>
-        <tr>
-            <td><%= row.device_vendor_name %></td>
-            <td><%= row.device_model %></td>
-            <td><%= row.nm_lan_vlan_number %></td>
-            <td><%= row.device_manager_nm_lan_interface %></td>
-            <td><%= row.switch_manager_nm_lan_interface %></td>
-        </tr>
-    <% }); %>
-    </tbody>
-    </table>
-
-</div>
-
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-
-</body>
-</html>
-
diff --git a/admportal/views/ucpe/phsCredentials.ejs b/admportal/views/ucpe/phsCredentials.ejs
deleted file mode 100644
index 508b5a25..00000000
--- a/admportal/views/ucpe/phsCredentials.ejs
+++ /dev/null
@@ -1,202 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#phs_server_credentials').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>PHS Server Credentials</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-		if (result.code.length > 0) { 
-			if ( result.code == 'success' ) { %>
-				<div class='alert alert-success' role='alert'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } else { %> 
-				<div class='alert alert-danger' role='danger'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } %>
-		<% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-
-	 <% if(priv == 'A'){ %>
-        <div class="actions" style="padding:15px 0px;">
-            <button class="btn btn-primary" data-toggle="modal" data-target="#add_phs_credentials">
-            Add PHS Credentials
-            </button>
-            </div>
-    <% } %>
-
-	<table id="phs_server_credentials" class="table table-hover table-condensed">
-      <thead>
-        <tr>
-		  <th>*Device Vendor Name</th>
-          <th>*Customer Name</th>
-		  <th>*IP Addresses</th>
-          <th>PHS Username</th>
-          <th>PHS Password</th>
-		   <% if(priv == 'A'){ %>
-          <th>Action</th>
-          <% } %>
-        </tr>
-      </thead>
-      <tbody>
-      <% rows.forEach( function(row) { %> 
-        <tr>
-            <td><%= row.device_vendor_name %></td>
-            <td><%= row.customer_name %></td>
-            <td><%= row.ip_addresses %></td>
-            <td><%= row.phs_username %></td>
-            <td>*****</td>
-			<% if(priv == 'A') { %>
-            <td>
-				<button type="button" class="btn btn-default btn-xs"
-                onclick="updatePhsCredentials('<%=row.device_vendor_name %>','<%= row.customer_name %>','<%= row.ip_addresses %>','<%= row.phs_username %>','<%= row.phs_password %>');">Update</button>
-				<button type="button" class="btn btn-default btn-xs"
-				onclick="deletePhsCredentials('<%= row.device_vendor_name %>', '<%= row.customer_name %>', '<%= row.ip_addresses %>' );">Delete</button>
-            </td>
-            <% } %>
-
-        </tr>
-    <% }); %>
-      </tbody>
-    </table>
-
-</div>
-
-<% include ../partials/phs_credentials %>
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-<script type="text/javascript">
-function submitPhsCredentials(form)
-{
-    var errorMsg='';
-    var device_vendor_name = '';
-	var customer_name = '';
-	var ip_addresses = '';
-	var phs_username = '';
-	var phs_password = '';
-	var confirm_phs_password = '';
-
-    if ( form.name == 'addForm' )
-    {
-		device_vendor_name = form.nf_device_vendor_name;
-		customer_name = form.nf_customer_name;
-		ip_addresses = form.nf_ip_addresses;
-		phs_username = form.nf_phs_username;
-		phs_password = form.nf_phs_password;
-		confirm_phs_password = form.nf_confirm_phs_password;
-
-    	if ( (device_vendor_name.value == null) || (device_vendor_name.value == "") || isblank(device_vendor_name.value) )
-    	{
-        	errorMsg += 'Device Vendor Name is required.<br>';
-    	}
-    	if ( (customer_name.value == null) || (customer_name.value == "") || isblank(customer_name.value) )
-    	{
-        	errorMsg += 'Customer Name is required.<br>';
-    	}
-    	if ( (ip_addresses.value == null) || (ip_addresses.value == "") || isblank(ip_addresses.value) ){
-        	errorMsg += 'IP Addresses is required.<br>';
-    	}
-    	if( errorMsg.length > 0 ) {
-        	bootbox.alert(errorMsg);
-        	return;
-    	}
-
-		if ( phs_password.value != confirm_phs_password.value )
-		{
-			bootbox.alert('Passwords do not match.');
-			return;
-		}
-    }
-    else
-    {
-		device_vendor_name = form.uf_device_vendor_name;
-		customer_name = form.uf_customer_name;
-		ip_addresses = form.uf_ip_addresses;
-		phs_username = form.uf_phs_username;
-		phs_password = form.uf_phs_password;
-		confirm_phs_password = form.uf_confirm_phs_password;
-
-		if ( phs_password.value != confirm_phs_password.value )
-		{
-			bootbox.alert('Passwords do not match.');
-			return;
-		}
-    }
-    form.submit();
-}
-
-function updatePhsCredentials(device_vendor_name,customer_name,ip_addresses,phs_username,phs_password) {
-
-    document.getElementById('uf_device_vendor_name').value=device_vendor_name;
-    document.getElementById('uf_customer_name').value=customer_name;
-    document.getElementById('uf_ip_addresses').value=ip_addresses;
-    document.getElementById('uf_phs_username').value=phs_username;
-    document.getElementById('uf_phs_password').value=phs_password;
-
-    $('#update_phs_credentials').modal('show');
-}
-
-function deletePhsCredentials(device_vendor_name, customer_name, ip_addresses) {
-
-    bootbox.confirm({
-        message: "Are you sure you want to delete PHS Credentials " + device_vendor_name + "|" + customer_name + "|" + ip_addresses,
-        callback: function(result) {
-            if ( result )
-            {
-				location.assign("/ucpe/deletePhsCredentials?device_vendor_name=" + device_vendor_name 
-					+ "&customer_name=" + customer_name + "&ip_addresses=" + ip_addresses);
-            }
-            return;
-        },
-        buttons: {
-            cancel: {
-                label: "Cancel"
-            },
-            confirm: {
-                label: "Yes"
-            }
-        }
-    });
-}
-
-</script>
-
-</body>
-</html>
-
diff --git a/admportal/views/ucpe/phsServers.ejs b/admportal/views/ucpe/phsServers.ejs
deleted file mode 100644
index 1f28dbb2..00000000
--- a/admportal/views/ucpe/phsServers.ejs
+++ /dev/null
@@ -1,92 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#phs_servers').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>uCPE PHS Servers</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-        if (result.code.length > 0) {
-            if ( result.code == 'success' ) { %>
-                <div class='alert alert-success' role='alert'>
-                <%
-                for ( x in result.msg ){ %>
-                    <div><%= result.msg[x] %></div>
-                <% } %>
-                </div>
-            <% } else { %>
-                <div class='alert alert-danger' role='danger'>
-                <%
-                for ( x in result.msg ){ %>
-                    <div><%= result.msg[x] %></div>
-                <% } %>
-                </div>
-            <% } %>
-        <% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-
-<!--
-	 <% if (priv == 'A'){ %>
-    <div class="actions" style="padding:15px 0px;">
-    <button class="btn btn-primary" data-toggle="modal" data-target="#add_vnf_profile">
-      Add VNF Profile
-    </button>
-    </div>
-    <% } %>
--->
-
-	<table id="phs_servers" class="table table-hover table-condensed">
-    <thead>
-        <tr>
-		  <th>*DEVICE_VENDOR_NAME</th>
-		  <th>*CUSTOMER_NAME</th>
-		  <th>IP_ADDRESSES</th>
-        </tr>
-    </thead>
-	<tbody>
-    <% rows.forEach( function(row) { %>
-        <tr>
-            <td><%= row.device_vendor_name %></td>
-            <td><%= row.customer_name %></td>
-            <td><%= row.ip_addresses %></td>
-        </tr>
-    <% }); %>
-    </tbody>
-    </table>
-
-</div>
-
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-
-</body>
-</html>
-
diff --git a/admportal/views/ucpe/physicalDeviceLogins.ejs b/admportal/views/ucpe/physicalDeviceLogins.ejs
deleted file mode 100644
index 0dd78d41..00000000
--- a/admportal/views/ucpe/physicalDeviceLogins.ejs
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#device_logins').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>uCPE Physical Device Logins</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-        if (result.code.length > 0) {
-            if ( result.code == 'success' ) { %>
-                <div class='alert alert-success' role='alert'>
-                <%
-                for ( x in result.msg ){ %>
-                    <div><%= result.msg[x] %></div>
-                <% } %>
-                </div>
-            <% } else { %>
-                <div class='alert alert-danger' role='danger'>
-                <%
-                for ( x in result.msg ){ %>
-                    <div><%= result.msg[x] %></div>
-                <% } %>
-                </div>
-            <% } %>
-        <% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-
-<!--
-	 <% if (priv == 'A'){ %>
-    <div class="actions" style="padding:15px 0px;">
-    <button class="btn btn-primary" data-toggle="modal" data-target="#add_vnf_profile">
-      Add VNF Profile
-    </button>
-    </div>
-    <% } %>
--->
-
-	<table id="device_logins" class="table table-hover table-condensed">
-    <thead>
-        <tr>
-		  <th>*CUSTOMER_NAME</th>
-		  <th>*DEVICE_VENDOR_NAME</th>
-		  <th>*DEVICE_MODEL</th>
-		  <th>*DEVICE_MANAGER_HASHED_PASSWORD</th>
-		  <th>*SWITCH_MANAGER_HASHED_PASSWORD</th>
-		  <th>*OS_HASHED_PASSWORD</th>
-        </tr>
-    </thead>
-	<tbody>
-    <% rows.forEach( function(row) { %>
-        <tr>
-            <td><%= row.customer_name %></td>
-            <td><%= row.device_vendor_name %></td>
-            <td><%= row.device_model %></td>
-            <td><%= row.device_manager_hashed_password %></td>
-            <td><%= row.switch_manager_hashed_password %></td>
-            <td><%= row.os_hashed_password %></td>
-        </tr>
-    <% }); %>
-    </tbody>
-    </table>
-
-</div>
-
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-
-</body>
-</html>
-
diff --git a/admportal/views/ucpe/referenceData.ejs b/admportal/views/ucpe/referenceData.ejs
deleted file mode 100644
index 6196c46e..00000000
--- a/admportal/views/ucpe/referenceData.ejs
+++ /dev/null
@@ -1,224 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#reference_data').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>uCPE Reference Data</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-		if (result.code.length > 0) { 
-			if ( result.code == 'success' ) { %>
-				<div class='alert alert-success' role='alert'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } else { %> 
-				<div class='alert alert-danger' role='danger'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } %>
-		<% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-
-	<table id="reference_data" class="table table-hover table-condensed">
-      <thead>
-        <tr>
-		  <th>REFERENCE_ID</th>
-		  <th>STATUS</th>
-          <th>FILENAME</th>
-          <th>ATTUID</th>
-          <th>DATE</th>
-		  <% if(priv == 'A'){ %>
-          <th>Action</th>
-          <% } %>
-        </tr>
-      </thead>
-      <tbody>
-		<% var i=0; retData.forEach( function(rowObj) { %>
-        <tr>
-            <td><%= rowObj.row.reference_id %></td>
-            <td><%= rowObj.row.status %></td>
-			<td>
-                <a data-toggle="collapse"
-                    href="#collapseExample<%= i %>" aria-expanded="false"
-                    aria-controls="collapseExample"><%= rowObj.row.filename %>
-                </a>
-                <div class="collapse" id="collapseExample<%= i %>">
-                    <div class="well">
-                        <pre><%= rowObj.filecontent %></pre>
-                    </div>
-                </div>
-           </td>
-            <td><%= rowObj.row.attuid %></td>
-            <td><%= rowObj.row.ts %></td>
-			<% if(priv == 'A' ) { %>
-            <td>
-			<% if ( rowObj.row.status == 'pending' ) { %>
-				<button type="button" class="btn btn-default btn-xs"
-            	onclick="importReferenceData('<%= rowObj.row.reference_id %>','<%= rowObj.row.status %>','<%= rowObj.row.filename %>','<%= rowObj.row.ts %>');">Import</button>
-			<% } %>
-				<button type="button" class="btn btn-default btn-xs"
-            	onclick="deleteReferenceData('<%= rowObj.row.reference_id %>','<%= rowObj.row.filename %>');">Delete</button>
-			</td>
-            <% } %>
-        </tr>
-		<% i++; }); %>
-      </tbody>
-    </table>
-
-	<% if(priv == 'A'){ %>
-	<div class="actions" style="padding:0px 25px;">
-	<form method="POST" action="/ucpe/uploadReferenceData" enctype="multipart/form-data">
-		<div class="form-group">
-    		<label for="dest">File input</label>
-    		<input name="filename" type="file" id="dest">
-    		<p class="help-block">Choose a file to upload.</p>
-  		</div>
-            <button type="button" class="btn btn-default"
-                onclick="uploadFile(this.form);">Upload File</button>
-	</form>
-	</div>
-	<% } %>
-</div>
-
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-<script type="text/javascript">
-
-function getVnfData(vnf_name,vnf_type,svc_request_id)
-{
-	location.assign("/mobility/viewVnfData?vnf_name=" + vnf_name + "&vnf_type=" + vnf_type );
-	return;
-}
-function importReferenceData(reference_id,status,filename,ts)
-{
-	var alertMessage = '';
-	if ( status != 'pending' )
-	{
-		bootbox.alert("Upload Status must be in 'pending' state.");
-		return;
-	}
-	if ( filename.substring(0,11) == 'ucpedevice_' ){
-        alertMessage = "Are you sure you want to import file:" + filename + " and replace the UCPE_MAPPED_SERVICE_PORT and UCPE_SERVICE_PORT tables?";
-	}else if ( filename.substring(0,14) == 'ucpeapilogins_' ){
-        alertMessage = "Are you sure you want to import file:" + filename + " and replace the UCPE_VNF_LOGINS, UCPE_PHYSICAL_DEVICE_LOGINS and UCPE_API_LOGINS tables?";
-	}else if ( filename.substring(0,17) == 'ucpenminterfaces_' ){
-        alertMessage = "Are you sure you want to import file:" + filename + " and replace the UCPE_VNF_NM_INTERFACES and UCPE_NM_INTERFACES tables?";
-	}else if ( filename.substring(0,15) == 'ucpephsservers_' ){
-        alertMessage = "Are you sure you want to import file:" + filename + " and replace the UCPE_PHS_SERVERS table?";
-	}else if ( filename.substring(0,15) == 'ucpencsservers_' ){
-        alertMessage = "Are you sure you want to import file:" + filename + " and replace the UCPE_CUSTOMER_NCS_SERVERS table?";
-	}else if ( filename.substring(0,15) == 'ucpevnfcatalog_' ){
-        alertMessage = "Are you sure you want to import file:" + filename + " and replace the UCPE_VNF_MODELS, UCPE_VNF_MODEL_SOFTWARE and UCPE_VNF_MODEL_FEATURES tables?";
-	}else if ( filename.substring(0,16) == 'ucpemcapservers_' ){
-        alertMessage = "Are you sure you want to import file:" + filename + " and replace the UCPE_MCAP_SERVERS table?";
-	}else if ( filename.substring(0,23) == 'ucpechainingtopologies_' ){
-        alertMessage = "Are you sure you want to import file:" + filename + " and replace the UCPE_CHAINING_TOPOLOGIES table?";
-	}else if ( filename.substring(0,16) == 'ucpevnfportinfo_' ){
-        alertMessage = "Are you sure you want to import file:" + filename + " and replace the UCPE_VNF_PORT and UCPE_MAP_TO_DEVICE tables?";
-	} else {
-		bootbox.alert('Invalid Filename in database: ' + filename);
-		return;
-	}
-	bootbox.confirm({
-        message: alertMessage,
-        callback: function(result) {
-            if ( result )
-            {
-				if ( filename.substring(0,11) == 'ucpedevice_' ){
-					location.assign("/ucpe/importUcpeDevices?id=" + reference_id + "&filename=" + filename + "&status=" + status);
-				}else if ( filename.substring(0,14) == 'ucpeapilogins_' ){
-					location.assign("/ucpe/importApiLogins?id=" + reference_id + "&filename=" + filename + "&status=" + status);
-				}else if ( filename.substring(0,17) == 'ucpenminterfaces_' ){
-					location.assign("/ucpe/importNmInterfaces?id=" + reference_id + "&filename=" + filename + "&status=" + status);
-				}else if ( filename.substring(0,15) == 'ucpephsservers_' ){
-					location.assign("/ucpe/importPhsServers?id=" + reference_id + "&filename=" + filename + "&status=" + status);
-				}else if ( filename.substring(0,15) == 'ucpencsservers_' ){
-					location.assign("/ucpe/importNcsServers?id=" + reference_id + "&filename=" + filename + "&status=" + status);
-				}else if ( filename.substring(0,15) == 'ucpevnfcatalog_' ){
-					location.assign("/ucpe/importVnfCatalog?id=" + reference_id + "&filename=" + filename + "&status=" + status);
-				}else if ( filename.substring(0,16) == 'ucpemcapservers_' ){
-					location.assign("/ucpe/importMcapServers?id=" + reference_id + "&filename=" + filename + "&status=" + status);
-				}else if ( filename.substring(0,23) == 'ucpechainingtopologies_' ){
-					location.assign("/ucpe/importChainTopo?id=" + reference_id + "&filename=" + filename + "&status=" + status);
-				}else if ( filename.substring(0,16) == 'ucpevnfportinfo_' ){
-					location.assign("/ucpe/importVnfPortInfo?id=" + reference_id + "&filename=" + filename + "&status=" + status);
-				} else {
-					bootbox.alert('Invalid Filename: ' + filename);
-					return;
-				}
-            }
-            return;
-        },
-        buttons: {
-            cancel: {
-                label: "Cancel"
-            },
-            confirm: {
-                label: "Yes"
-            }
-        }
-    });
-}
-
-function deleteReferenceData(reference_id,filename)
-{
-
-    bootbox.confirm({
-        message: "Are you sure you want to delete uploaded file [" + filename + "]? (This action will not effect the database.)",
-        callback: function(result) {
-            if ( result )
-            {
-				location.assign("/ucpe/deleteReferenceData?id=" + reference_id + "&filename=" + filename); 
-            }
-            return;
-        },
-        buttons: {
-            cancel: {
-                label: "Cancel"
-            },
-            confirm: {
-                label: "Yes"
-            }
-        }
-    });
-}
-
-</script>
-
-</body>
-</html>
-
diff --git a/admportal/views/ucpe/serviceManagerCredentials.ejs b/admportal/views/ucpe/serviceManagerCredentials.ejs
deleted file mode 100644
index 9e156f2a..00000000
--- a/admportal/views/ucpe/serviceManagerCredentials.ejs
+++ /dev/null
@@ -1,171 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#service_manager_credentials').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>Service Manager Credentials</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-		if (result.code.length > 0) { 
-			if ( result.code == 'success' ) { %>
-				<div class='alert alert-success' role='alert'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } else { %> 
-				<div class='alert alert-danger' role='danger'>
-				<%
-				for ( x in result.msg ){ %>
-					<div><%= result.msg[x] %></div>
-				<% } %>
-				</div>
-			<% } %>
-		<% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-
-	 <% if(priv == 'A'){ %>
-        <div class="actions" style="padding:15px 0px;">
-            <button class="btn btn-primary" data-toggle="modal" data-target="#add_service_manager_credentials">
-            Add Service Manager Credentials
-            </button>
-            </div>
-    <% } %>
-
-	<table id="service_manager_credentials" class="table table-hover table-condensed">
-      <thead>
-        <tr>
-          <th>Service Manager Username</th>
-          <th>Service Manager Password</th>
-		   <% if(priv == 'A'){ %>
-          <th>Action</th>
-          <% } %>
-        </tr>
-      </thead>
-      <tbody>
-      <% rows.forEach( function(row) { %> 
-        <tr>
-            <td><%= row.service_manager_username %></td>
-            <td>*****</td>
-			<% if(priv == 'A') { %>
-            <td>
-				<button type="button" class="btn btn-default btn-xs"
-                onclick="updateServiceManagerCredentials('<%=row.service_manager_username %>','<%= row.service_manager_password %>');">Update</button>
-				<button type="button" class="btn btn-default btn-xs"
-				onclick="deleteServiceManagerCredentials('<%= row.service_manager_username %>', '<%= row.service_manager_password %>');">Delete</button>
-            </td>
-            <% } %>
-
-        </tr>
-    <% }); %>
-      </tbody>
-    </table>
-
-</div>
-
-<% include ../partials/service_manager_credentials %>
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-<script type="text/javascript">
-function submitServiceManagerCredentials(form)
-{
-    var errorMsg='';
-	var service_manager_username = '';
-	var service_manager_password = '';
-	var confirm_service_manager_password = '';
-
-    if ( form.name == 'addForm' )
-    {
-		service_manager_username = form.nf_service_manager_username;
-		service_manager_password = form.nf_service_manager_password;
-		confirm_service_manager_password = form.nf_confirm_service_manager_password;
-
-		if ( service_manager_password.value != confirm_service_manager_password.value )
-		{
-			bootbox.alert('Passwords do not match.');
-			return;
-		}
-    }
-    else
-    {
-		service_manager_username = form.uf_service_manager_username;
-		service_manager_password = form.uf_service_manager_password;
-		confirm_service_manager_password = form.uf_confirm_service_manager_password;
-
-		if ( service_manager_password.value != confirm_service_manager_password.value )
-		{
-			bootbox.alert('Passwords do not match.');
-			return;
-		}
-    }
-    form.submit();
-}
-
-function updateServiceManagerCredentials(service_manager_username,service_manager_password) {
-
-    document.getElementById('uf_service_manager_username').value=service_manager_username;
-    document.getElementById('uf_service_manager_password').value=service_manager_password;
-
-    $('#update_service_manager_credentials').modal('show');
-}
-
-function deleteServiceManagerCredentials(service_manager_username, service_manager_password) {
-
-	var url_string = encodeURI("/ucpe/deleteServiceManagerCredentials?service_manager_username=" + service_manager_username 
-					+ "&service_manager_password=" + service_manager_password);
-
-
-    bootbox.confirm({
-        message: "Are you sure you want to delete Service Manager Credentials? " + service_manager_username,
-        callback: function(result) {
-            if ( result )
-            {
-				location.assign(url_string);
-            }
-            return;
-        },
-        buttons: {
-            cancel: {
-                label: "Cancel"
-            },
-            confirm: {
-                label: "Yes"
-            }
-        }
-    });
-}
-
-</script>
-
-</body>
-</html>
-
diff --git a/admportal/views/ucpe/servicePort.ejs b/admportal/views/ucpe/servicePort.ejs
deleted file mode 100644
index 80537133..00000000
--- a/admportal/views/ucpe/servicePort.ejs
+++ /dev/null
@@ -1,88 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#service_port').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>uCPE Service Port</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-        if (result.code.length > 0) {
-            if ( result.code == 'success' ) { %>
-                <div class='alert alert-success' role='alert'>
-                <%
-                for ( x in result.msg ){ %>
-                    <div><%= result.msg[x] %></div>
-                <% } %>
-                </div>
-            <% } else { %>
-                <div class='alert alert-danger' role='danger'>
-                <%
-                for ( x in result.msg ){ %>
-                    <div><%= result.msg[x] %></div>
-                <% } %>
-                </div>
-            <% } %>
-        <% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-
-	<table id="service_port" class="table table-hover table-condensed">
-    <thead>
-        <tr>
-		  <th>*DEVICE_VENDOR_NAME</th>
-		  <th>*DEVICE_MODEL</th>
-		  <th>*SERVICE_PORT_NAME</th>
-		  <th>PHYSICAL_PORT_NAME</th>
-		  <th>PHYSICAL_SPEED</th>
-		  <th>PHYSICAL_SPEED_UNITS</th>
-        </tr>
-    </thead>
-	<tbody>
-    <% rows.forEach( function(row) { %>
-        <tr>
-            <td><%= row.device_vendor_name %></td>
-            <td><%= row.device_model %></td>
-            <td><%= row.service_port_name %></td>
-            <td><%= row.physical_port_name %></td>
-            <td><%= row.physical_speed %></td>
-            <td><%= row.physical_speed_units %></td>
-        </tr>
-    <% }); %>
-    </tbody>
-    </table>
-
-</div>
-
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-
-</body>
-</html>
-
diff --git a/admportal/views/ucpe/vnfLogins.ejs b/admportal/views/ucpe/vnfLogins.ejs
deleted file mode 100644
index f5e88731..00000000
--- a/admportal/views/ucpe/vnfLogins.ejs
+++ /dev/null
@@ -1,94 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#vnf_logins').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>uCPE VNF Logins</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-        if (result.code.length > 0) {
-            if ( result.code == 'success' ) { %>
-                <div class='alert alert-success' role='alert'>
-                <%
-                for ( x in result.msg ){ %>
-                    <div><%= result.msg[x] %></div>
-                <% } %>
-                </div>
-            <% } else { %>
-                <div class='alert alert-danger' role='danger'>
-                <%
-                for ( x in result.msg ){ %>
-                    <div><%= result.msg[x] %></div>
-                <% } %>
-                </div>
-            <% } %>
-        <% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-
-<!--
-	 <% if (priv == 'A'){ %>
-    <div class="actions" style="padding:15px 0px;">
-    <button class="btn btn-primary" data-toggle="modal" data-target="#add_vnf_profile">
-      Add VNF Profile
-    </button>
-    </div>
-    <% } %>
--->
-
-	<table id="vnf_logins" class="table table-hover table-condensed">
-    <thead>
-        <tr>
-		  <th>*CUSTOMER_NAME</th>
-		  <th>*VNF_VENDOR_NAME</th>
-		  <th>*VNF_MODEL</th>
-		  <th>HASHED_PASSWORD</th>
-        </tr>
-    </thead>
-	<tbody>
-    <% rows.forEach( function(row) { %>
-        <tr>
-            <td><%= row.customer_name %></td>
-            <td><%= row.vnf_vendor_name %></td>
-            <td><%= row.vnf_model %></td>
-            <td><%= row.hashed_password %></td>
-        </tr>
-    <% }); %>
-    </tbody>
-    </table>
-
-</div>
-
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-
-</body>
-</html>
-
diff --git a/admportal/views/ucpe/vnfMapDevice.ejs b/admportal/views/ucpe/vnfMapDevice.ejs
deleted file mode 100644
index fbfa2ba5..00000000
--- a/admportal/views/ucpe/vnfMapDevice.ejs
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#vnf_map_to_device').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>uCPE VNF Map to Device</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-        if (result.code.length > 0) {
-            if ( result.code == 'success' ) { %>
-                <div class='alert alert-success' role='alert'>
-                <%
-                for ( x in result.msg ){ %>
-                    <div><%= result.msg[x] %></div>
-                <% } %>
-                </div>
-            <% } else { %>
-                <div class='alert alert-danger' role='danger'>
-                <%
-                for ( x in result.msg ){ %>
-                    <div><%= result.msg[x] %></div>
-                <% } %>
-                </div>
-            <% } %>
-        <% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-
-<!--
-	 <% if (priv == 'A'){ %>
-    <div class="actions" style="padding:15px 0px;">
-    <button class="btn btn-primary" data-toggle="modal" data-target="#add_vnf_profile">
-      Add VNF Profile
-    </button>
-    </div>
-    <% } %>
--->
-
-	<table id="vnf_map_to_device" class="table table-hover table-condensed">
-    <thead>
-        <tr>
-		  <th>*VNF_VENDOR_NAME</th>
-		  <th>*VNF_MODEL</th>
-		  <th>*SERVICE_PORT_NAME</th>
-		  <th>*DEVICE_VENDOR_NAME</th>
-		  <th>*DEVICE_MODEL</th>
-		  <th>*MAPPED_SERVICE_PORT_NAME</th>
-        </tr>
-    </thead>
-	<tbody>
-    <% rows.forEach( function(row) { %>
-        <tr>
-            <td><%= row.vnf_vendor_name %></td>
-            <td><%= row.vnf_model %></td>
-            <td><%= row.service_port_name %></td>
-            <td><%= row.device_vendor_name %></td>
-            <td><%= row.device_model %></td>
-            <td><%= row.mapped_service_port_name %></td>
-        </tr>
-    <% }); %>
-    </tbody>
-    </table>
-
-</div>
-
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-
-</body>
-</html>
-
diff --git a/admportal/views/ucpe/vnfModelFeatures.ejs b/admportal/views/ucpe/vnfModelFeatures.ejs
deleted file mode 100644
index 40151790..00000000
--- a/admportal/views/ucpe/vnfModelFeatures.ejs
+++ /dev/null
@@ -1,90 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#vnf_model_features').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>uCPE VNF Model Features</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-        if (result.code.length > 0) {
-            if ( result.code == 'success' ) { %>
-                <div class='alert alert-success' role='alert'>
-                <%
-                for ( x in result.msg ){ %>
-                    <div><%= result.msg[x] %></div>
-                <% } %>
-                </div>
-            <% } else { %>
-                <div class='alert alert-danger' role='danger'>
-                <%
-                for ( x in result.msg ){ %>
-                    <div><%= result.msg[x] %></div>
-                <% } %>
-                </div>
-            <% } %>
-        <% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-
-<!--
-	 <% if (priv == 'A'){ %>
-    <div class="actions" style="padding:15px 0px;">
-    <button class="btn btn-primary" data-toggle="modal" data-target="#add_vnf_profile">
-      Add VNF Profile
-    </button>
-    </div>
-    <% } %>
--->
-
-	<table id="vnf_model_features" class="table table-hover table-condensed">
-    <thead>
-        <tr>
-		  <th>*ATT PART NUMBER</th>
-		  <th>*VNF_FEATURE</th>
-        </tr>
-    </thead>
-	<tbody>
-    <% rows.forEach( function(row) { %>
-        <tr>
-            <td><%= row.att_part_number %></td>
-            <td><%= row.vnf_feature %></td>
-        </tr>
-    <% }); %>
-    </tbody>
-    </table>
-
-</div>
-
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-
-</body>
-</html>
-
diff --git a/admportal/views/ucpe/vnfModelSoftware.ejs b/admportal/views/ucpe/vnfModelSoftware.ejs
deleted file mode 100644
index f82b5b8a..00000000
--- a/admportal/views/ucpe/vnfModelSoftware.ejs
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#vnf_model_software').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>uCPE VNF Model Software</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-        if (result.code.length > 0) {
-            if ( result.code == 'success' ) { %>
-                <div class='alert alert-success' role='alert'>
-                <%
-                for ( x in result.msg ){ %>
-                    <div><%= result.msg[x] %></div>
-                <% } %>
-                </div>
-            <% } else { %>
-                <div class='alert alert-danger' role='danger'>
-                <%
-                for ( x in result.msg ){ %>
-                    <div><%= result.msg[x] %></div>
-                <% } %>
-                </div>
-            <% } %>
-        <% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-
-<!--
-	 <% if (priv == 'A'){ %>
-    <div class="actions" style="padding:15px 0px;">
-    <button class="btn btn-primary" data-toggle="modal" data-target="#add_vnf_profile">
-      Add VNF Profile
-    </button>
-    </div>
-    <% } %>
--->
-
-	<table id="vnf_model_software" class="table table-hover table-condensed">
-    <thead>
-        <tr>
-		  <th>*ATT PART NUMBER</th>
-		  <th>*SOFTWARE_VERSION</th>
-		  <th>SOFTWARE_VERSION_STATE</th>
-		  <th>SOFTWARE_FILENAME</th>
-		  <th>SOFTWARE_FILETYPE</th>
-		  <th>FILE_MD5_VALUE</th>
-        </tr>
-    </thead>
-	<tbody>
-    <% rows.forEach( function(row) { %>
-        <tr>
-            <td><%= row.att_part_number %></td>
-            <td><%= row.software_version %></td>
-            <td><%= row.software_version_state %></td>
-            <td><%= row.software_filename %></td>
-            <td><%= row.software_filetype %></td>
-            <td><%= row.file_md5_value %></td>
-        </tr>
-    <% }); %>
-    </tbody>
-    </table>
-
-</div>
-
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-
-</body>
-</html>
-
diff --git a/admportal/views/ucpe/vnfModels.ejs b/admportal/views/ucpe/vnfModels.ejs
deleted file mode 100644
index df71306b..00000000
--- a/admportal/views/ucpe/vnfModels.ejs
+++ /dev/null
@@ -1,122 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#vnf_models').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>uCPE VNF Models</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-        if (result.code.length > 0) {
-            if ( result.code == 'success' ) { %>
-                <div class='alert alert-success' role='alert'>
-                <%
-                for ( x in result.msg ){ %>
-                    <div><%= result.msg[x] %></div>
-                <% } %>
-                </div>
-            <% } else { %>
-                <div class='alert alert-danger' role='danger'>
-                <%
-                for ( x in result.msg ){ %>
-                    <div><%= result.msg[x] %></div>
-                <% } %>
-                </div>
-            <% } %>
-        <% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-
-<!--
-	 <% if (priv == 'A'){ %>
-    <div class="actions" style="padding:15px 0px;">
-    <button class="btn btn-primary" data-toggle="modal" data-target="#add_vnf_profile">
-      Add VNF Profile
-    </button>
-    </div>
-    <% } %>
--->
-
-	<table id="vnf_models" class="table table-hover table-condensed">
-    <thead>
-        <tr>
-		  <th>*ATT PART NUMBER</th>
-		  <th>VNF_TYPE</th>
-		  <th>VENDOR_NAME</th>
-		  <th>VENDOR_PART_NUMBER</th>
-		  <th>VENDOR_MODEL</th>
-		  <th>VCPU_DEFAULT</th>
-		  <th>VCPU_MIN</th>
-		  <th>VCPU_MAX</th>
-		  <th>VMEMORY_DEFAULT</th>
-		  <th>VMEMORY_UNITS</th>
-		  <th>VMEMORY_MIN</th>
-		  <th>VMEMORY_MAX</th>
-		  <th>VDISK_DEFAULT</th>
-		  <th>VDISK_UNITS</th>
-		  <th>VDISK_MIN</th>
-		  <th>VDISK_MAX</th>
-		  <th>SPEED_UNITS</th>
-		  <th>SPEED</th>
-        </tr>
-    </thead>
-	<tbody>
-    <% rows.forEach( function(row) { %>
-        <tr>
-            <td><%= row.att_part_number %></td>
-            <td><%= row.vnf_type %></td>
-            <td><%= row.vendor_name %></td>
-            <td><%= row.vendor_part_number %></td>
-            <td><%= row.vendor_model %></td>
-            <td><%= row.vcpu_default %></td>
-            <td><%= row.vcpu_min %></td>
-            <td><%= row.vcpu_max %></td>
-            <td><%= row.vmemory_default %></td>
-            <td><%= row.vmemory_units %></td>
-            <td><%= row.vmemory_min %></td>
-            <td><%= row.vmemory_max %></td>
-            <td><%= row.vdisk_default %></td>
-            <td><%= row.vdisk_units %></td>
-            <td><%= row.vdisk_min %></td>
-            <td><%= row.vdisk_max %></td>
-            <td><%= row.speed_units %></td>
-            <td><%= row.speed %></td>
-        </tr>
-    <% }); %>
-    </tbody>
-    </table>
-
-</div>
-
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-
-</body>
-</html>
-
diff --git a/admportal/views/ucpe/vnfNmInterfaces.ejs b/admportal/views/ucpe/vnfNmInterfaces.ejs
deleted file mode 100644
index 3430f6b0..00000000
--- a/admportal/views/ucpe/vnfNmInterfaces.ejs
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#vnf_nm_interfaces').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>uCPE VNF NM Interfaces</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-        if (result.code.length > 0) {
-            if ( result.code == 'success' ) { %>
-                <div class='alert alert-success' role='alert'>
-                <%
-                for ( x in result.msg ){ %>
-                    <div><%= result.msg[x] %></div>
-                <% } %>
-                </div>
-            <% } else { %>
-                <div class='alert alert-danger' role='danger'>
-                <%
-                for ( x in result.msg ){ %>
-                    <div><%= result.msg[x] %></div>
-                <% } %>
-                </div>
-            <% } %>
-        <% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-
-<!--
-	 <% if (priv == 'A'){ %>
-    <div class="actions" style="padding:15px 0px;">
-    <button class="btn btn-primary" data-toggle="modal" data-target="#add_vnf_profile">
-      Add VNF Profile
-    </button>
-    </div>
-    <% } %>
--->
-
-	<table id="vnf_nm_interfaces" class="table table-hover table-condensed">
-    <thead>
-        <tr>
-		  <th>*DEVICE_VENDOR_NAME</th>
-		  <th>*DEVICE_MODEL</th>
-		  <th>*VNF_VENDOR_NAME</th>
-		  <th>*VNF_MODEL</th>
-		  <th>NM_LAN_INTERFACE</th>
-		  <th>NM_LOOPBACK_INTERFACE</th>
-        </tr>
-    </thead>
-	<tbody>
-    <% rows.forEach( function(row) { %>
-        <tr>
-            <td><%= row.device_vendor_name %></td>
-            <td><%= row.device_model %></td>
-            <td><%= row.vnf_vendor_name %></td>
-            <td><%= row.vnf_model %></td>
-            <td><%= row.nm_lan_interface %></td>
-            <td><%= row.nm_loopback_interface %></td>
-        </tr>
-    <% }); %>
-    </tbody>
-    </table>
-
-</div>
-
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-
-</body>
-</html>
-
diff --git a/admportal/views/ucpe/vnfPorts.ejs b/admportal/views/ucpe/vnfPorts.ejs
deleted file mode 100644
index 834eada9..00000000
--- a/admportal/views/ucpe/vnfPorts.ejs
+++ /dev/null
@@ -1,94 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>SDN-C AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#vnf_ports').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-<body>
-
-<div class="well well-sm">
-<h3>uCPE VNF Ports</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-        if (result.code.length > 0) {
-            if ( result.code == 'success' ) { %>
-                <div class='alert alert-success' role='alert'>
-                <%
-                for ( x in result.msg ){ %>
-                    <div><%= result.msg[x] %></div>
-                <% } %>
-                </div>
-            <% } else { %>
-                <div class='alert alert-danger' role='danger'>
-                <%
-                for ( x in result.msg ){ %>
-                    <div><%= result.msg[x] %></div>
-                <% } %>
-                </div>
-            <% } %>
-        <% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-
-<!--
-	 <% if (priv == 'A'){ %>
-    <div class="actions" style="padding:15px 0px;">
-    <button class="btn btn-primary" data-toggle="modal" data-target="#add_vnf_profile">
-      Add VNF Profile
-    </button>
-    </div>
-    <% } %>
--->
-
-	<table id="vnf_ports" class="table table-hover table-condensed">
-    <thead>
-        <tr>
-		  <th>*VNF_VENDOR_NAME</th>
-		  <th>*VNF_MODEL</th>
-		  <th>*SERVICE_PORT_NAME</th>
-		  <th>PHYSICAL_PORT_NAME</th>
-        </tr>
-    </thead>
-	<tbody>
-    <% rows.forEach( function(row) { %>
-        <tr>
-            <td><%= row.vnf_vendor_name %></td>
-            <td><%= row.vnf_model %></td>
-            <td><%= row.service_port_name %></td>
-            <td><%= row.physical_port_name %></td>
-        </tr>
-    <% }); %>
-    </tbody>
-    </table>
-
-</div>
-
-<footer>
-    <% include ../partials/footer %>
-</footer>
-
-
-</body>
-</html>
-
diff --git a/admportal/views/user/list.ejs b/admportal/views/user/list.ejs
deleted file mode 100644
index ec650b0b..00000000
--- a/admportal/views/user/list.ejs
+++ /dev/null
@@ -1,194 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="utf-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <% include ../partials/head %>
-  <% include ../partials/header %>
-  <script type="text/javascript" src="/javascripts/admportal.js" async></script>
-  <title>AdminPortal</title>
-<script class="init">
-    $(document).ready(function() {
-    $('#user_admin').DataTable( {
-        "order": [[ 0, "asc" ]]
-    } );
-} );
-</script>
-
-</head>
-
-<body>
-
-<div class="well well-sm">
-<h3>User Administration</h3>
-</div>
-
-<% if ( typeof result != 'undefined' ) {
-        if (result.code.length > 0) {
-            if ( result.code == 'success' ) { %>
-                <div class='alert alert-success' role='alert'><%=result.msg %></div>
-            <% } else { %>
-                <div class='alert alert-danger' role='danger'><%=result.msg %></div>
-            <% } %>
-        <% } %>
-<% } %>
-
-<% if( typeof privilege != 'undefined'){
-    var priv = privilege.privilege;
-} else {
-    var priv = 'A';
-} %>
-
-
-<div class="container-fluid">
-    <div class="actions" style="padding:15px 0px;">
-	<% if(priv == 'A') { %>
-    	<button class="btn btn-primary" data-toggle="modal" data-target="#new_user">Add User</button>
-	<% } %>
-
-    </div>
-    <div class="content">
-     <table id="user_admin" class="table table-hover table-condensed">
-      <thead>
-        <tr>
-			<th>Email</th>
-        	<th>Password</th>
-        	<th>Privilege</th>
-	  		<% if(priv == 'A'){ %>
-          	<th>Action</th>
-		  	<% } %>
-        </tr>
-      </thead>
-      <tbody>
-    <% if (rows)  {
-         rows.forEach(function(row) { %>
-			<tr>
-            <td><%= row.email %></td> 
-            <td>**********</td> 
-            <td>
-				<% if(row.privilege == 'A'){ %>
-					Administrator
-				<% } else if (row.privilege == 'R') { %>
-					Readonly
-				<% } else { %>
-					unknown
-				<% } %>
-			</td> 
-			<% if(priv == 'A') { %>
-			<td>
-				<form name="rowform">
-					<button type="button" class="btn btn-default btn-xs"
-						onclick="updateRequest('<%=row.email %>', '<%=row.password %>', '<%=row.privilege %>');">Update</button>
-					<button type="button" class="btn btn-default btn-xs"
-						onclick="deleteRequest('<%=row.email %>');">Delete</button>
-				</form>
-			</td>
-			<% } %>
-			</tr>
-    <% }); }; %>
-      </tbody>
-    </table>
-   </div>
-
-   <% include ../partials/newuserform %>
-   <% include ../partials/userform %>
-
-    <footer>
-        <% include ../partials/footer %>
-    </footer>
-    
-<script type="text/javascript">
-
-function submitUserAdmin(form)
-{
-	var errorMsg='';
-	var email = '';
-	var password = '';
-	var confirm_password = '';
-	var privilege = '';
-
-    if ( form.name == 'addForm' )
-    {
-    	email = form.nf_email;
-        password = form.nf_password;
-        confirm_password = form.nf_confirm_password;
-        privilege = form.nf_privilege;
-
-        if ( (email.value == null) || (email.value == "") || isblank(email.value) )
-        {
-                errorMsg += 'Email is required.<br>';
-        }
-        if( errorMsg.length > 0 ) {
-                bootbox.alert(errorMsg);
-                return;
-        }
-
-        if ( password.value != confirm_password.value )
-        {
-            bootbox.alert('Passwords do not match.');
-            return;
-        }
-    }
-    else
-    {
-    	email = form.uf_email;
-        password = form.uf_password;
-        confirm_password = form.uf_confirm_password;
-        privilege = form.uf_privilege;
-
-        if ( (email.value == null) || (email.value == "") || isblank(email.value) )
-        {
-                errorMsg += 'Email is required.<br>';
-        }
-        if ( password.value != confirm_password.value )
-        {
-            bootbox.alert('Passwords do not match.');
-            return;
-        }
-    }
-    form.submit();
-}
-
-function deleteRequest(email) {
-
-	bootbox.confirm({
-  		message: "Are you sure you want to delete user [" + email + "] ?",
-  		callback: function(result) {
-			if ( result )
-			{
-				location.assign("/user/deleteUser?email=" + email);
-			}
-			return;
-  		},
-  		buttons: {
-    		cancel: {
-      			label: "Cancel"
-    		},
-    		confirm: {
-      			label: "Yes"
-    		}
-  		}
-	});
-}
-function updateRequest(email,password,privilege) {
-
-	document.getElementById('uf_email').value = email;
-	document.getElementById('uf_key_email').value = email;
-	document.getElementById('uf_password').value = password;
-	document.getElementById('uf_confirm_password').value = password;
-	if ( privilege == "A" ){
-		document.getElementById('uf_privilege').value = 'admin';
-	}else if (privilege == "R"){
-		document.getElementById('uf_privilege').value = 'readonly';
-	}else{
-		document.getElementById('uf_privilege').value = 'admin';
-	}
-	document.getElementById('uf_action').value = "/user/updateUser";
-	$('#myUserModal').modal('show');
-     
-}
-</script>
-
-</body>
-</html>
-
author	Dan Timoney <dtimoney@att.com>	2021-04-12 08:17:37 -0400
committer	Dan Timoney <dtimoney@att.com>	2021-04-12 08:17:37 -0400
commit	5cabe36fe85a780a9fb808343d6341f15da13524 (patch)
tree	4893568c164dfaa82226eacc75fec4d622acb398 /admportal/views
parent	41a3f91544616f0e785e0e9e552e9fd0234cc9b3 (diff)