diff --git a/src/main/java/net/onrc/onos/ofcontroller/floodlightlistener/NetworkGraphPublisher.java b/src/main/java/net/onrc/onos/ofcontroller/floodlightlistener/NetworkGraphPublisher.java
index 88d9475..f0a828a 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/floodlightlistener/NetworkGraphPublisher.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/floodlightlistener/NetworkGraphPublisher.java
@@ -28,9 +28,9 @@
 import net.onrc.onos.ofcontroller.networkgraph.NetworkGraph;
 import net.onrc.onos.ofcontroller.networkgraph.NetworkGraphDiscoveryInterface;
 import net.onrc.onos.ofcontroller.networkgraph.PortEvent;
+import net.onrc.onos.ofcontroller.networkgraph.PortEvent.SwitchPort;
 import net.onrc.onos.ofcontroller.networkgraph.Switch;
 import net.onrc.onos.ofcontroller.networkgraph.SwitchEvent;
-import net.onrc.onos.ofcontroller.networkgraph.PortEvent.SwitchPort;
 import net.onrc.onos.registry.controller.IControllerRegistryService;
 import net.onrc.onos.registry.controller.IControllerRegistryService.ControlChangeCallback;
 import net.onrc.onos.registry.controller.RegistryException;
@@ -42,16 +42,6 @@
 
 import com.google.common.net.InetAddresses;
 
-/*
- * I've created a copy of the old NetworkGraphPublisher so I can integrate
- * the new API with ONOS while still having the old NetworkGraphPublisher
- * to reference.
- * TODO Remove old NetworkGraphPublisher once the integration of the new
- * API is complete.
- * For now, we just write to the database and don't worry about sending
- * notifications.
- * TODO Send notification after each database write
- */
 public class NetworkGraphPublisher implements /*IOFSwitchListener,*/
 												IOFSwitchPortListener,
 												ILinkDiscoveryListener,
@@ -66,10 +56,10 @@
 	private INetworkGraphService networkGraphService;
 
 	private IOnosDeviceService onosDeviceService;
-	
+
 	private NetworkGraph networkGraph;
 	private NetworkGraphDiscoveryInterface networkGraphDiscoveryInterface;
-	
+
 	private static final String ENABLE_CLEANUP_PROPERTY = "EnableCleanup";
 	private boolean cleanupEnabled = true;
 	private static final int CLEANUP_TASK_INTERVAL = 60; // in seconds
@@ -83,7 +73,7 @@
         public void run() {
             String old = Thread.currentThread().getName();
             Thread.currentThread().setName("SwitchCleanup@" + old);
-            
+
             try {
             	log.debug("Running cleanup thread");
                 switchCleanup();
@@ -96,7 +86,7 @@
                 Thread.currentThread().setName(old);
             }
         }
-        
+
         private void switchCleanup() {
         	Iterable<Switch> switches = networkGraph.getSwitches();
 
@@ -104,10 +94,10 @@
         	// For each switch check if a controller exists in controller registry
         	for (Switch sw: switches) {
     			try {
-    				String controller = 
+    				String controller =
     						registryService.getControllerForSwitch(sw.getDpid());
     				if (controller == null) {
-    					log.debug("Requesting control to set switch {} INACTIVE", 
+    					log.debug("Requesting control to set switch {} INACTIVE",
     							HexString.toHexString(sw.getDpid()));
     					registryService.requestControl(sw.getDpid(), this);
     				}
@@ -167,10 +157,10 @@
 
 	@Override
 	public void linkDiscoveryUpdate(LDUpdate update) {
-		LinkEvent linkEvent = new LinkEvent(update.getSrc(), 
-				(long)update.getSrcPort(), update.getDst(), 
+		LinkEvent linkEvent = new LinkEvent(update.getSrc(),
+				(long)update.getSrcPort(), update.getDst(),
 				(long)update.getDstPort());
-		
+
 		switch (update.getOperation()) {
 		case LINK_ADDED:
 			networkGraphDiscoveryInterface.putLinkDiscoveryEvent(linkEvent);
@@ -224,7 +214,7 @@
 		}
 
 		SwitchEvent switchEvent = new SwitchEvent(sw.getId());
-		
+
 		List<PortEvent> portEvents = new ArrayList<PortEvent>();
 		for (OFPhysicalPort port : sw.getPorts()) {
 			portEvents.add(new PortEvent(sw.getId(), (long)port.getPortNumber()));
@@ -237,7 +227,7 @@
 		new TopologyElement(sw.getId());
 	    datagridService.notificationSendTopologyElementAdded(topologyElement);
 		*/
-		
+
 	    // Publish: add the ports
 	    // TODO: Add only ports that are UP?
 	    for (OFPhysicalPort port : sw.getPorts()) {
@@ -335,28 +325,28 @@
 		onosDeviceService.addOnosDeviceListener(this);
 
 		networkGraph = networkGraphService.getNetworkGraph();
-		networkGraphDiscoveryInterface = 
+		networkGraphDiscoveryInterface =
 				networkGraphService.getNetworkGraphDiscoveryInterface();
-		
+
 		// Run the cleanup thread
-		String enableCleanup = 
+		String enableCleanup =
 				context.getConfigParams(this).get(ENABLE_CLEANUP_PROPERTY);
 		if (enableCleanup != null && enableCleanup.toLowerCase().equals("false")) {
 			cleanupEnabled = false;
 		}
-		
+
 		log.debug("Cleanup thread is {}enabled", (cleanupEnabled)? "" : "not ");
-		
+
 		if (cleanupEnabled) {
-			IThreadPoolService threadPool = 
+			IThreadPoolService threadPool =
 					context.getServiceImpl(IThreadPoolService.class);
-			cleanupTask = new SingletonTask(threadPool.getScheduledExecutor(), 
+			cleanupTask = new SingletonTask(threadPool.getScheduledExecutor(),
 					new SwitchCleanup());
 			// Run the cleanup task immediately on startup
 			cleanupTask.reschedule(0, TimeUnit.SECONDS);
 		}
 	}
-	
+
 	@Override
 	public void onosDeviceAdded(OnosDevice device) {
 		log.debug("Called onosDeviceAdded mac {}", device.getMacAddress());
@@ -365,19 +355,19 @@
 		List<SwitchPort> spLists = new ArrayList<SwitchPort>();
 		spLists.add(sp);
 		DeviceEvent event = new DeviceEvent(device.getMacAddress());
-		event.setAttachmentPoints(spLists);	
+		event.setAttachmentPoints(spLists);
 		event.setLastSeenTime(device.getLastSeenTimestamp().getTime());
 		if(device.getIpv4Address() != null) {
-			InetAddress ip = InetAddresses.fromInteger(device.getIpv4Address());	
+			InetAddress ip = InetAddresses.fromInteger(device.getIpv4Address());
 			event.addIpAddress(ip);
 		}
 		//Does not use Vlan info now.
-		
-		networkGraphDiscoveryInterface.putDeviceDiscoveryEvent(event);	
+
+		networkGraphDiscoveryInterface.putDeviceDiscoveryEvent(event);
 	}
 
 	@Override
-	public void onosDeviceRemoved(OnosDevice device) {	
+	public void onosDeviceRemoved(OnosDevice device) {
 		log.debug("Called onosDeviceRemoved");
 		DeviceEvent event = new DeviceEvent(device.getMacAddress());
 		networkGraphDiscoveryInterface.removeDeviceDiscoveryEvent(event);
diff --git a/src/main/java/net/onrc/onos/ofcontroller/floodlightlistener/OldNetworkGraphPublisher.java b/src/main/java/net/onrc/onos/ofcontroller/floodlightlistener/OldNetworkGraphPublisher.java
deleted file mode 100644
index 7c05467..0000000
--- a/src/main/java/net/onrc/onos/ofcontroller/floodlightlistener/OldNetworkGraphPublisher.java
+++ /dev/null
@@ -1,449 +0,0 @@
-package net.onrc.onos.ofcontroller.floodlightlistener;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import net.floodlightcontroller.core.IFloodlightProviderService;
-import net.floodlightcontroller.core.IOFSwitch;
-import net.floodlightcontroller.core.IOFSwitchListener;
-import net.floodlightcontroller.core.module.FloodlightModuleContext;
-import net.floodlightcontroller.core.module.FloodlightModuleException;
-import net.floodlightcontroller.core.module.IFloodlightModule;
-import net.floodlightcontroller.core.module.IFloodlightService;
-import net.floodlightcontroller.core.util.SingletonTask;
-import net.floodlightcontroller.threadpool.IThreadPoolService;
-import net.onrc.onos.datagrid.IDatagridService;
-import net.onrc.onos.ofcontroller.core.IOFSwitchPortListener;
-import net.onrc.onos.ofcontroller.linkdiscovery.ILinkDiscoveryListener;
-import net.onrc.onos.ofcontroller.linkdiscovery.ILinkDiscoveryService;
-import net.onrc.onos.ofcontroller.linkdiscovery.Link;
-import net.onrc.onos.registry.controller.IControllerRegistryService;
-import net.onrc.onos.registry.controller.IControllerRegistryService.ControlChangeCallback;
-
-import org.openflow.protocol.OFPhysicalPort;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class OldNetworkGraphPublisher implements
-					      IOFSwitchListener,
-					      IOFSwitchPortListener,
-					      ILinkDiscoveryListener,
-					      IFloodlightModule {
-
-	protected final static Logger log = LoggerFactory.getLogger(OldNetworkGraphPublisher.class);
-	//protected IDeviceService deviceService;
-	protected IControllerRegistryService registryService;
-	// protected DBOperation op;
-
-	protected static final String DBConfigFile = "dbconf";
-        protected static final String GraphDBStore = "graph_db_store";
-	protected static final String CleanupEnabled = "EnableCleanup";
-	protected IThreadPoolService threadPool;
-	protected IFloodlightProviderService floodlightProvider;
-
-	protected final int CLEANUP_TASK_INTERVAL = 60; // 1 min
-	protected SingletonTask cleanupTask;
-	protected ILinkDiscoveryService linkDiscovery;
-
-	protected IDatagridService datagridService;
-
-    /**
-     *  Cleanup and synch switch state from registry
-     */
-    protected class SwitchCleanup implements ControlChangeCallback, Runnable {
-        @Override
-        public void run() {
-            String old = Thread.currentThread().getName();
-            Thread.currentThread().setName("SwitchCleanup@" + old);
-            try {
-            	log.debug("Running cleanup thread");
-		// op = GraphDBManager.getDBOperation();
-                switchCleanup();
-            }
-            catch (Exception e) {
-                log.error("Error in cleanup thread", e);
-            } finally {
-            	// op.close();
-                    cleanupTask.reschedule(CLEANUP_TASK_INTERVAL,
-                                              TimeUnit.SECONDS);
-                Thread.currentThread().setName(old);
-            }
-        }
-
-		@Override
-		public void controlChanged(long dpid, boolean hasControl) {
-		    /*
-			if (hasControl) {
-				log.debug("got control to set inactive sw {}", HexString.toHexString(dpid));
-				try {
-					// Get the affected ports
-					List<Short> ports = swStore.getPorts(HexString.toHexString(dpid));
-					// Get the affected links
-					List<Link> links = linkStore.getLinks(HexString.toHexString(dpid));
-					// Get the affected reverse links
-					List<Link> reverseLinks = linkStore.getReverseLinks(HexString.toHexString(dpid));
-					links.addAll(reverseLinks);
-
-					//if (swStore.updateSwitch(HexString.toHexString(dpid), SwitchState.INACTIVE, DM_OPERATION.UPDATE)) {
-					if (swStore.deactivateSwitch(HexString.toHexString(dpid))) {
-					    registryService.releaseControl(dpid);
-
-					    // TODO publish UPDATE_SWITCH event here
-					    //
-					    // NOTE: Here we explicitly send
-					    // notification to remove the
-					    // switch, because it is inactive
-					    //
-					    TopologyElement topologyElement =
-						new TopologyElement(dpid);
-					    datagridService.notificationSendTopologyElementRemoved(topologyElement);
-
-					    // Publish: remove the affected ports
-					    for (Short port : ports) {
-						TopologyElement topologyElementPort =
-						    new TopologyElement(dpid, port);
-						datagridService.notificationSendTopologyElementRemoved(topologyElementPort);
-					    }
-					    // Publish: remove the affected links
-					    for (Link link : links) {
-						TopologyElement topologyElementLink =
-						    new TopologyElement(link.getSrc(),
-									link.getSrcPort(),
-									link.getDst(),
-									link.getDstPort());
-						datagridService.notificationSendTopologyElementRemoved(topologyElementLink);
-					    }
-					}
-				} catch (Exception e) {
-	                log.error("Error in SwitchCleanup:controlChanged ", e);
-				}
-			}
-		    */
-		}
-    }
-
-    protected void switchCleanup() {
-	/*
-    	//op.close();
-    	Iterable<ISwitchObject> switches = op.getActiveSwitches();
-
-    	log.debug("Checking for inactive switches");
-    	// For each switch check if a controller exists in controller registry
-    	for (ISwitchObject sw: switches) {
-			//log.debug("checking if switch is inactive: {}", sw.getDPID());
-			try {
-				long dpid = HexString.toLong(sw.getDPID());
-				String controller = registryService.getControllerForSwitch(dpid);
-				if (controller == null) {
-					log.debug("request Control to set inactive sw {}", HexString.toHexString(dpid));
-					registryService.requestControl(dpid, new SwitchCleanup());
-				//} else {
-				//	log.debug("sw {} is controlled by controller: {}",HexString.toHexString(dpid),controller);
-				}
-			} catch (NumberFormatException e) {
-				log.debug("Caught NumberFormatException trying to requestControl in cleanup thread");
-				e.printStackTrace();
-			} catch (RegistryException e) {
-				log.debug("Caught RegistryException trying to requestControl in cleanup thread");
-				e.printStackTrace();
-			}
-		}
-    	// op.close();
-	*/
-    }
-
-    @Override
-    public void linkDiscoveryUpdate(LDUpdate update) {
-    	Link lt = new Link(update.getSrc(),update.getSrcPort(),update.getDst(),update.getDstPort());
-    	//log.debug("{}:LinkDicoveryUpdate(): Updating Link {}",this.getClass(), lt);
-
-    	switch (update.getOperation()) {
-    	case LINK_REMOVED:
-    		log.debug("LinkDiscoveryUpdate(): Removing link {}", lt);
-
-		/*
-    		if (linkStore.deleteLink(lt)) {
-    			// TODO publish DELETE_LINK event here
-    			TopologyElement topologyElement =
-    					new TopologyElement(update.getSrc(),
-    							update.getSrcPort(),
-    							update.getDst(),
-    							update.getDstPort());
-    			datagridService.notificationSendTopologyElementRemoved(topologyElement);
-    		}
-		*/
-    		break;
-    	case LINK_UPDATED:
-    		log.debug("LinkDiscoveryUpdate(): Updating link {}", lt);
-
-		/*
-    		LinkInfo linfo = linkStore.getLinkInfo(lt);
-    		// TODO update "linfo" using portState derived using "update"
-    		if (linkStore.update(lt, linfo, DM_OPERATION.UPDATE)) {
-    			// TODO publish UPDATE_LINK event here
-    			//
-    			// TODO NOTE: Here we assume that updated
-    			// link is UP.
-    			//
-    			TopologyElement topologyElement =
-    					new TopologyElement(update.getSrc(),
-    							update.getSrcPort(),
-    							update.getDst(),
-    							update.getDstPort());
-    			datagridService.notificationSendTopologyElementUpdated(topologyElement);
-    		}
-		*/
-    		break;
-    	case LINK_ADDED:
-    		log.debug("LinkDiscoveryUpdate(): Adding link {}", lt);
-
-		/*
-    		if (linkStore.addLink(lt)) {
-    			// TODO publish ADD_LINK event here
-    			TopologyElement topologyElement =
-    					new TopologyElement(update.getSrc(),
-    							update.getSrcPort(),
-    							update.getDst(),
-    							update.getDstPort());
-    			datagridService.notificationSendTopologyElementAdded(topologyElement);
-    		}
-		*/
-
-    		break;
-    	default:
-    		break;
-    	}
-
-    }
-
-	@Override
-	public void addedSwitch(IOFSwitch sw) {
-	    /*
-		if (registryService.hasControl(sw.getId())) {
-			if (swStore.addSwitch(sw)) {
-			    // TODO publish ADD_SWITCH event here
-			    TopologyElement topologyElement =
-				new TopologyElement(sw.getId());
-			    datagridService.notificationSendTopologyElementAdded(topologyElement);
-
-			    // Publish: add the ports
-			    // TODO: Add only ports that are UP?
-			    for (OFPhysicalPort port : sw.getPorts()) {
-					TopologyElement topologyElementPort =
-					    new TopologyElement(sw.getId(), port.getPortNumber());
-					datagridService.notificationSendTopologyElementAdded(topologyElementPort);
-
-					// Allow links to be discovered on this port now that it's
-					// in the database
-					linkDiscovery.RemoveFromSuppressLLDPs(sw.getId(), port.getPortNumber());
-			    }
-
-			    // Add all links that might be connected already
-			    List<Link> links = linkStore.getLinks(HexString.toHexString(sw.getId()));
-			    // Add all reverse links as well
-			    List<Link> reverseLinks = linkStore.getReverseLinks(HexString.toHexString(sw.getId()));
-			    links.addAll(reverseLinks);
-
-			    // Publish: add the links
-			    for (Link link : links) {
-				TopologyElement topologyElementLink =
-				    new TopologyElement(link.getSrc(),
-							link.getSrcPort(),
-							link.getDst(),
-							link.getDstPort());
-				datagridService.notificationSendTopologyElementAdded(topologyElementLink);
-			    }
-			}
-		}
-	    */
-	}
-
-	@Override
-	public void removedSwitch(IOFSwitch sw) {
-		/*
-		if (registryService.hasControl(sw.getId())) {
-			// Get the affected ports
-			List<Short> ports = swStore.getPorts(HexString.toHexString(sw.getId()));
-			// Get the affected links
-			List<Link> links = linkStore.getLinks(HexString.toHexString(sw.getId()));
-			// Get the affected reverse links
-			List<Link> reverseLinks = linkStore.getReverseLinks(HexString.toHexString(sw.getId()));
-			links.addAll(reverseLinks);
-
-			if (swStore.deleteSwitch(sw.getStringId())) {
-			    // TODO publish DELETE_SWITCH event here
-			    TopologyElement topologyElement =
-				new TopologyElement(sw.getId());
-			    datagridService.notificationSendTopologyElementRemoved(topologyElement);
-
-			    // Publish: remove the affected ports
-			    for (Short port : ports) {
-				TopologyElement topologyElementPort =
-				    new TopologyElement(sw.getId(), port);
-				datagridService.notificationSendTopologyElementRemoved(topologyElementPort);
-			    }
-			    // Publish: remove the affected links
-			    for (Link link : links) {
-				TopologyElement topologyElementLink =
-				    new TopologyElement(link.getSrc(),
-							link.getSrcPort(),
-							link.getDst(),
-							link.getDstPort());
-				datagridService.notificationSendTopologyElementRemoved(topologyElementLink);
-			    }
-			}
-		}
-		*/
-	}
-
-	@Override
-	public void switchPortChanged(Long switchId) {
-		// NOTE: Event not needed here. This callback always coincide with add/remove callback.
-	}
-
-
-	@Override
-	public void switchPortAdded(Long switchId, OFPhysicalPort port) {
-	    /*
-		if (swStore.addPort(HexString.toHexString(switchId), port)) {
-			// Allow links to be discovered on this port now that it's
-			// in the database
-			linkDiscovery.RemoveFromSuppressLLDPs(switchId, port.getPortNumber());
-
-		    // TODO publish ADD_PORT event here
-		    TopologyElement topologyElement =
-			new TopologyElement(switchId, port.getPortNumber());
-		    datagridService.notificationSendTopologyElementAdded(topologyElement);
-
-		    // Add all links that might be connected already
-		    List<Link> links = linkStore.getLinks(switchId, port.getPortNumber());
-		    // Add all reverse links as well
-		    List<Link> reverseLinks = linkStore.getReverseLinks(switchId, port.getPortNumber());
-		    links.addAll(reverseLinks);
-
-		    // Publish: add the links
-		    for (Link link : links) {
-			TopologyElement topologyElementLink =
-			    new TopologyElement(link.getSrc(),
-						link.getSrcPort(),
-						link.getDst(),
-						link.getDstPort());
-			datagridService.notificationSendTopologyElementAdded(topologyElementLink);
-		    }
-		}
-	    */
-	}
-
-	@Override
-	public void switchPortRemoved(Long switchId, OFPhysicalPort port) {
-		// Remove all links that might be connected already
-
-		/*
-		PerformanceMonitor.start("SwitchPortRemoved.DbAccess");
-
-		List<Link> links = linkStore.getLinks(switchId, port.getPortNumber());
-		// Remove all reverse links as well
-		List<Link> reverseLinks = linkStore.getReverseLinks(switchId, port.getPortNumber());
-		links.addAll(reverseLinks);
-
-		if (swStore.deletePort(HexString.toHexString(switchId), port.getPortNumber())) {
-		    PerformanceMonitor.stop("SwitchPortRemoved.DbAccess");
-		    PerformanceMonitor.start("SwitchPortRemoved.NotificationSend");
-		    // TODO publish DELETE_PORT event here
-		    TopologyElement topologyElement =
-			new TopologyElement(switchId, port.getPortNumber());
-		    datagridService.notificationSendTopologyElementRemoved(topologyElement);
-
-		    // Publish: remove the links
-		    for (Link link : links) {
-			TopologyElement topologyElementLink =
-			    new TopologyElement(link.getSrc(),
-						link.getSrcPort(),
-						link.getDst(),
-						link.getDstPort());
-			datagridService.notificationSendTopologyElementRemoved(topologyElementLink);
-		    }
-		    PerformanceMonitor.stop("SwitchPortRemoved.NotificationSend");
-		    PerformanceMonitor.report("SwitchPortRemoved.DbAccess");
-		    PerformanceMonitor.report("TopologyEntryRemoved.NotificationReceived");
-		}
-		*/
-	}
-
-	@Override
-	public String getName() {
-		return "OldNetworkGraphPublisher";
-	}
-
-	@Override
-	public Collection<Class<? extends IFloodlightService>> getModuleServices() {
-		return null;
-	}
-
-	@Override
-	public Map<Class<? extends IFloodlightService>, IFloodlightService> getServiceImpls() {
-		return null;
-	}
-
-	@Override
-	public Collection<Class<? extends IFloodlightService>> getModuleDependencies() {
-	    Collection<Class<? extends IFloodlightService>> l =
-	            new ArrayList<Class<? extends IFloodlightService>>();
-	        l.add(IFloodlightProviderService.class);
-	        //l.add(IDeviceService.class);
-	        l.add(IDatagridService.class);
-	        l.add(IThreadPoolService.class);
-		l.add(ILinkDiscoveryService.class);
-	        return l;
-	}
-
-	@Override
-	public void init(FloodlightModuleContext context)
-			throws FloodlightModuleException {
-		Map<String, String> configMap = context.getConfigParams(this);
-		String conf = configMap.get(DBConfigFile);
-                String dbStore = configMap.get(GraphDBStore);
-		// op = GraphDBManager.getDBOperation();
-
-		floodlightProvider =
-	            context.getServiceImpl(IFloodlightProviderService.class);
-		//deviceService = context.getServiceImpl(IDeviceService.class);
-		linkDiscovery = context.getServiceImpl(ILinkDiscoveryService.class);
-		threadPool = context.getServiceImpl(IThreadPoolService.class);
-		registryService = context.getServiceImpl(IControllerRegistryService.class);
-		datagridService = context.getServiceImpl(IDatagridService.class);
-
-		log.debug("Initializing OldNetworkGraphPublisher module with {}", conf);
-
-	}
-
-	@Override
-	public void startUp(FloodlightModuleContext context) {
-	    /*
-		Map<String, String> configMap = context.getConfigParams(this);
-		String cleanupNeeded = configMap.get(CleanupEnabled);
-
-		//deviceService.addListener(this);
-		floodlightProvider.addOFSwitchListener(this);
-		linkDiscovery.addListener(this);
-
-		log.debug("Adding EventListener");
-		IDBConnection conn = op.getDBConnection();
-		conn.addEventListener(new LocalTopologyEventListener((DBConnection) conn));
-	       // Setup the Cleanup task.
-		if (cleanupNeeded == null || !cleanupNeeded.equals("False")) {
-				ScheduledExecutorService ses = threadPool.getScheduledExecutor();
-				cleanupTask = new SingletonTask(ses, new SwitchCleanup());
-				cleanupTask.reschedule(CLEANUP_TASK_INTERVAL, TimeUnit.SECONDS);
-		}
-
-		//
-		// NOTE: No need to register with the Datagrid Service,
-		// because we don't need to receive any notifications from it.
-		//
-	    */
-	}
-
-}