diff --git a/WebContent/html/webpages/navbar.jsp b/WebContent/html/webpages/navbar.jsp
index dc349f3..731039a 100644
--- a/WebContent/html/webpages/navbar.jsp
+++ b/WebContent/html/webpages/navbar.jsp
@@ -26,11 +26,6 @@
 		</ul>
 	</div>
 	<%
-
-	Mail mail = new Mail();
-	mail.send();
-
-
 	Cookie[] usercookies = request.getCookies();
 	String navsso = "invalid";
 	String navname = "error";
diff --git a/WebContent/html/webpages/navbar.jspf b/WebContent/html/webpages/navbar.jspf
deleted file mode 100644
index ba0c9e4..0000000
--- a/WebContent/html/webpages/navbar.jspf
+++ /dev/null
@@ -1,56 +0,0 @@
-<%@ page import = "database.*,entities.User" %>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
-<div class="container-fluid">
-	<div class="navbar-header">
-		<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
-			<span class="sr-only">One thing</span>
-			<span class="icon-bar"></span>
-			<span class="icon-bar"></span>
-			<span class="icon-bar"></span>
-		</button>
-		<a class="navbar-brand" href="../webpages/admin.jsp">
-			<img src="../imgs/synchrony-financial-logo-dlpx_1.png" style = "height: 100%; display: inline-block;">
-			&nbsp;&nbsp;&nbsp;&nbsp;
-			<p style = "display: inline-block" id = "user"></p>
-		</a>
-	</div>
-	<div id="navbar" class="navbar-collapse collapse" aria-expanded="false">
-		<ul class="nav navbar-nav navbar-right">
-			<li><a href="../webpages/">Home</a></li>
-			<li><a href="requestPage.jsp">Request Device</a></li>
-			<li><a href="returnPage.jsp">Return Device</a></li>
-			<li><a href="listingPage.jsp">Device Listing</a></li>
-			<li><a href="shoppingCart.jsp">Shopping Cart</a></li>
-		</ul>
-	</div>
-	<%
-	Cookie[] usercookies = request.getCookies();
-	String navsso = "invalid";
-	String navname = "error";
-	Cookie newCookie;
-	//iterate cookies
-	System.out.println("Cookies:\n----------\n");
-	for(Cookie c : usercookies){
-	System.out.println(c.getName());
-		if(c.getName().equals("ssoNum")){//when (and if) we get to user cookie we want to reset it
-			navsso = c.getValue(); 
-			c.setMaxAge(0);//delete current
-			newCookie = new Cookie("ssoNum",navsso);//make new one
-			newCookie.setMaxAge(30*60);
-			response.addCookie(newCookie);
-			break;
-		}
-	}
-	System.out.println("\nnavsso = "+navsso+"\n");
-	if(navsso.equals("invalid"))//if we didn't get a cookie, redirect to the homepage to log in again!
-		response.sendRedirect("../../index.jsp");
-	else{
-	User self = EmployeeQueries.getEmployeeByID(Integer.parseInt(navsso));
-	navname = self.getName();
-	}
-	%>
-</div>
-<script>
-var name = '<%=navname%>';
-document.getElementById('user').innerHTML = "Hi " + name + "!";
-</script>
\ No newline at end of file