diff --git a/src/com/xilinx/rapidwright/rwroute/PartialRouter.java b/src/com/xilinx/rapidwright/rwroute/PartialRouter.java
index 41ff49819..beea64f4f 100644
--- a/src/com/xilinx/rapidwright/rwroute/PartialRouter.java
+++ b/src/com/xilinx/rapidwright/rwroute/PartialRouter.java
@@ -236,7 +236,7 @@ protected void determineRoutingTargets() {
         // if so, unpreserve that blocking net
         Set<Net> unpreserveNets = new HashSet<>();
         for (Connection connection : indirectConnections) {
-            Net net = connection.getNetWrapper().getNet();
+            Net net = connection.getNet();
             Net preservedNet;
             assert((preservedNet = routingGraph.getPreservedNet(connection.getSourceRnode())) == null || preservedNet == net);
             RouteNode sinkRnode = connection.getSinkRnode();
@@ -271,7 +271,7 @@ protected void determineRoutingTargets() {
                         // routing
                         ripUp(connection);
                         connection.resetRoute();
-                        connection.getSink().setRouted(false);
+                        connection.setRouted(false);
                         break;
                     }
                 }
@@ -433,7 +433,7 @@ protected boolean saveRouting(Connection connection, RouteNode rnode) {
         assert(rnodes.size() > 1);
 
         // Check if alternate source exists (without creating one if it doesn't)
-        if (connection.getNetWrapper().getNet().getAlternateSource() != null) {
+        if (connection.getNet().getAlternateSource() != null) {
             Pair<SitePinInst,RouteNode> altSourceAndRnode = connection.getOrCreateAlternateSource(routingGraph);
             assert(altSourceAndRnode != null);
             RouteNode altSourceRnode = altSourceAndRnode.getSecond();
diff --git a/src/com/xilinx/rapidwright/rwroute/RWRoute.java b/src/com/xilinx/rapidwright/rwroute/RWRoute.java
index 8b6717b9d..347792703 100644
--- a/src/com/xilinx/rapidwright/rwroute/RWRoute.java
+++ b/src/com/xilinx/rapidwright/rwroute/RWRoute.java
@@ -338,7 +338,7 @@ protected void determineRoutingTargets() {
                             continue;
                         }
                         Net preservedNet = routingGraph.getPreservedNet(uphill);
-                        if (preservedNet != null && preservedNet != connection.getNetWrapper().getNet()) {
+                        if (preservedNet != null && preservedNet != connection.getNet()) {
                             continue;
                         }
                         assert((sinkRnode.getIntentCode() == IntentCode.NODE_CLE_CTRL &&
@@ -1443,7 +1443,7 @@ private void addNodesDelays(NetWrapper net) {
     protected void ripUp(Connection connection) {
         List<RouteNode> rnodes = connection.getRnodes();
         if (rnodes.isEmpty()) {
-            assert(!connection.getSink().isRouted());
+            assert(!connection.isRouted());
             return;
         }
 
@@ -1474,7 +1474,7 @@ protected void ripUp(Connection connection) {
     private void updateUsersAndPresentCongestionCost(Connection connection) {
         List<RouteNode> rnodes = connection.getRnodes();
         if (rnodes.isEmpty()) {
-            assert(!connection.getSink().isRouted());
+            assert(!connection.isRouted());
             return;
         }