diff --git a/src/test/java/net/onrc/onos/ofcontroller/core/INetMapTopologyObjectsIDeviceObjectTest.java b/src/test/java/net/onrc/onos/ofcontroller/core/INetMapTopologyObjectsIDeviceObjectTest.java
index 323a0eb..880335b 100644
--- a/src/test/java/net/onrc/onos/ofcontroller/core/INetMapTopologyObjectsIDeviceObjectTest.java
+++ b/src/test/java/net/onrc/onos/ofcontroller/core/INetMapTopologyObjectsIDeviceObjectTest.java
@@ -111,7 +111,6 @@
 		IPortObject portObj = ope.newPort(dpid, number);
 		IPortObject portObj2 = ope.newPort(dpid, number2);
 		
-		String ipaddr = "192.168.0.1";
 		IDeviceObject devObj = ope.newDevice();
 		
 		portObj.setDevice(devObj);
@@ -141,11 +140,8 @@
 	public void testSetRemoveHostPort() {
 		String dpid = "00:00:00:00:00:00:0a:07";
 		Short number = 1;	
-		Short number2 = 2;
 		IPortObject portObj = ope.newPort(dpid, number);
-		IPortObject portObj2 = ope.newPort(dpid, number2);
 		
-		String ipaddr = "192.168.0.1";
 		IDeviceObject devObj = ope.newDevice();
 		
 		devObj.setHostPort(portObj);
diff --git a/src/test/java/net/onrc/onos/ofcontroller/core/internal/SwitchStorageImplTest.java b/src/test/java/net/onrc/onos/ofcontroller/core/internal/SwitchStorageImplTest.java
index f276680..24c17f4 100644
--- a/src/test/java/net/onrc/onos/ofcontroller/core/internal/SwitchStorageImplTest.java
+++ b/src/test/java/net/onrc/onos/ofcontroller/core/internal/SwitchStorageImplTest.java
@@ -23,7 +23,6 @@
 import org.slf4j.LoggerFactory;
 
 import com.thinkaurelius.titan.core.TitanFactory;
-import com.thinkaurelius.titan.core.TitanGraph;
 
 //Add Powermock preparation
 @RunWith(PowerMockRunner.class)
@@ -35,8 +34,6 @@
 	String conf;
     private GraphDBConnection mockConn = null;
     private GraphDBOperation mockOpe = null;
-    private GraphDBOperation realOpe = null;
-    private TitanGraph titanGraph = null;
     ISwitchStorage swSt = null;
     
 	@Before
@@ -375,12 +372,10 @@
 	 * Expect:
 	 * 	Should call rollback.
 	 */
-	//@Ignore
 	@Test
 	public void testDeleteSwitchException() {
 		String dpid = "00:00:00:00:00:00:0a:07";
 		String state = "ACTIVE";
-		String type = "";
 		
 		//Mock Switch
 		ISwitchObject mockISw = createMock(ISwitchObject.class);
@@ -392,8 +387,8 @@
 		expect(mockOpe.newSwitch(dpid)).andReturn(mockISw);
 		mockOpe.commit();
 		expect(mockOpe.searchSwitch(dpid)).andReturn(mockISw);
-    	mockOpe.removeSwitch(mockISw);
-    	mockOpe.commit();
+		mockOpe.removeSwitch(mockISw);
+		mockOpe.commit();
 		expectLastCall().andThrow(new RuntimeException());
 		mockOpe.rollback();
 		mockOpe.close();
@@ -515,12 +510,10 @@
 	 * Expect:
 	 * 	Nothing happens.
 	 */
-	//@Ignore
 	@Test
 	public void testAddPortAbnormalNoSwitch() {
 		String dpid = "00:00:00:00:00:00:0a:01";
 		short portNumber = 5;
-		String state = "ACTIVE";
 		String name = "port 5 at SEA switch";
 		
 		OFPhysicalPort portToAdd = new OFPhysicalPort();
diff --git a/src/test/java/net/onrc/onos/ofcontroller/devicemanager/internal/DeviceStorageImplTestBB.java b/src/test/java/net/onrc/onos/ofcontroller/devicemanager/internal/DeviceStorageImplTestBB.java
index e4053f4..552cb9c 100644
--- a/src/test/java/net/onrc/onos/ofcontroller/devicemanager/internal/DeviceStorageImplTestBB.java
+++ b/src/test/java/net/onrc/onos/ofcontroller/devicemanager/internal/DeviceStorageImplTestBB.java
@@ -214,11 +214,8 @@
 				{
 
 					String portNumFromDB = port.getNumber().toString();
-					assertEquals(String.valueOf(portNum), portNumFromDB);						
+					assertEquals(String.valueOf(portNum), portNumFromDB);
 
-					ISwitchObject sw = port.getSwitch();
-					String str = sw.getDPID();
-					log.debug("");
 				}
 			}