diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigurePortForwardingRulesOnLogicalRouterCommand.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigurePortForwardingRulesOnLogicalRouterCommand.java
index 1d57e35a95c..5f0ea384af3 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigurePortForwardingRulesOnLogicalRouterCommand.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigurePortForwardingRulesOnLogicalRouterCommand.java
@@ -54,7 +54,6 @@ public class ConfigurePortForwardingRulesOnLogicalRouterCommand extends Command
 	 */
 	@Override
 	public boolean executeInSequence() {
-		// TODO Auto-generated method stub
 		return false;
 	}
 
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigurePublicIpsOnLogicalRouterCommand.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigurePublicIpsOnLogicalRouterCommand.java
index 8c7c8d71b09..0da0b4ec9da 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigurePublicIpsOnLogicalRouterCommand.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigurePublicIpsOnLogicalRouterCommand.java
@@ -43,7 +43,6 @@ public class ConfigurePublicIpsOnLogicalRouterCommand extends Command {
 
 	@Override
 	public boolean executeInSequence() {
-		// TODO Auto-generated method stub
 		return false;
 	}
 
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigureStaticNatRulesOnLogicalRouterCommand.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigureStaticNatRulesOnLogicalRouterCommand.java
index 4e5d37cb417..960f609cb54 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigureStaticNatRulesOnLogicalRouterCommand.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigureStaticNatRulesOnLogicalRouterCommand.java
@@ -57,7 +57,6 @@ public class ConfigureStaticNatRulesOnLogicalRouterCommand extends Command {
 	 */
 	@Override
 	public boolean executeInSequence() {
-		// TODO Auto-generated method stub
 		return false;
 	}
 
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java b/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
index 71f8454f8d5..1c8b8fb1dd3 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
@@ -268,10 +268,7 @@ public class NiciraNvpElement extends AdapterBase implements
 					+ network.getId());
 		}
 		try {
-			// FIXME Check if any services other than connectiviy are required
-			// If that is the case start the logical router with only the
-			// internal interface, leave the external interfaces to the
-			// IpDeployer
+			// Implement SourceNat immediately as we have al the info already
 			if (_networkManager.isProviderSupportServiceInNetwork(
 					network.getId(), Service.SourceNat, Provider.NiciraNvp)) {
 				s_logger.debug("Apparently we are supposed to provide SourceNat on this network");