diff --git a/junos-v21-core-router.j2 b/junos-v21-core-router.j2
index f7c8cff..71d1b71 100644
--- a/junos-v21-core-router.j2
+++ b/junos-v21-core-router.j2
@@ -115,6 +115,7 @@ interfaces {
 
 {% elif interface.lag %}
     {{ interface.name }} {
+        {{ macros.interface_description(interface, interface_context) }}
         gigether-options {
             802.3ad {{ interface.lag.name }};
         }
@@ -171,48 +172,15 @@ interfaces {
 {%- endif %}
 
 {%- endfor %}
-
-{#
-    ae34 {
-        vlan-tagging;
-        aggregated-ether-options {
-            minimum-links 1;
-            link-speed 100g;
-        }
-        unit 34 {
-            vlan-id 34;
-            family inet {
-                address 193.162.44.13/31;
-            }
-            family inet6 {
-                address 2a10:f0c0::13/127;
-            }
-        }
-    }
-    ae41 {
-        vlan-tagging;
-        aggregated-ether-options {
-            minimum-links 1;
-            link-speed 100g;
-        }
-        unit 41 {
-            vlan-id 41;
-            family inet {
-                address 193.162.44.14/31;
-            }
-            family inet6 {
-                address 2a10:f0c0::14/127;
-            }
-        }
-    }
-#}
     fxp0 {
         unit 0;
     }
 }
 routing-options {
     static {
-        route 172.22.0.0/16 next-hop 172.22.4.1;
+        {%- for (route, route_data) in device.config_context.get('routes',{}).items() %}
+        route {{ route }} next-hop {{ route_data.get('next-hop', None) }};
+        {%- endfor %}
     }
 }