diff --git a/data/configd-include.json b/data/configd-include.json
index dc00f0698..fe27ae2b7 100644
--- a/data/configd-include.json
+++ b/data/configd-include.json
@@ -1,113 +1,112 @@
 [
 "container.py",
 "firewall.py",
 "high-availability.py",
 "interfaces_bonding.py",
 "interfaces_bridge.py",
 "interfaces_dummy.py",
 "interfaces_ethernet.py",
 "interfaces_geneve.py",
 "interfaces_input.py",
 "interfaces_l2tpv3.py",
 "interfaces_loopback.py",
 "interfaces_macsec.py",
 "interfaces_openvpn.py",
 "interfaces_pppoe.py",
 "interfaces_pseudo-ethernet.py",
 "interfaces_sstpc.py",
 "interfaces_tunnel.py",
 "interfaces_virtual-ethernet.py",
 "interfaces_vti.py",
 "interfaces_vxlan.py",
 "interfaces_wireguard.py",
 "interfaces_wireless.py",
 "interfaces_wwan.py",
 "load-balancing_reverse-proxy.py",
 "load-balancing_wan.py",
 "nat.py",
 "nat64.py",
 "nat66.py",
 "netns.py",
 "pki.py",
 "policy.py",
 "policy_route.py",
 "policy_local-route.py",
 "protocols_babel.py",
 "protocols_bfd.py",
 "protocols_bgp.py",
 "protocols_eigrp.py",
 "protocols_failover.py",
 "protocols_igmp-proxy.py",
 "protocols_isis.py",
 "protocols_mpls.py",
 "protocols_nhrp.py",
 "protocols_ospf.py",
 "protocols_ospfv3.py",
 "protocols_pim.py",
 "protocols_pim6.py",
 "protocols_rip.py",
 "protocols_ripng.py",
 "protocols_rpki.py",
 "protocols_segment-routing.py",
 "protocols_static.py",
 "protocols_static_arp.py",
 "protocols_static_multicast.py",
 "protocols_static_neighbor-proxy.py",
 "qos.py",
-"service_aws_glb.py",
 "service_broadcast-relay.py",
 "service_config-sync.py",
 "service_conntrack-sync.py",
 "service_console-server.py",
 "service_dhcp-relay.py",
 "service_dhcp-server.py",
 "service_dhcpv6-relay.py",
 "service_dhcpv6-server.py",
 "service_dns_dynamic.py",
 "service_dns_forwarding.py",
 "service_event-handler.py",
 "service_https.py",
 "service_ids_ddos-protection.py",
 "service_ipoe-server.py",
 "service_lldp.py",
 "service_mdns_repeater.py",
 "service_monitoring_telegraf.py",
 "service_monitoring_zabbix-agent.py",
 "service_ndp-proxy.py",
 "service_ntp.py",
 "service_pppoe-server.py",
 "service_router-advert.py",
 "service_salt-minion.py",
 "service_sla.py",
 "service_ssh.py",
 "service_tftp-server.py",
 "service_upnp.py",
 "service_webproxy.py",
 "system_acceleration.py",
 "system_config-management.py",
 "system_conntrack.py",
 "system_console.py",
 "system_flow-accounting.py",
 "system_frr.py",
 "system_host-name.py",
 "system_ip.py",
 "system_ipv6.py",
 "system_lcd.py",
 "system_login_banner.py",
 "system_logs.py",
 "system_option.py",
 "system_proxy.py",
 "system_sflow.py",
 "system_sysctl.py",
 "system_syslog.py",
 "system_task-scheduler.py",
 "system_timezone.py",
 "system_update-check.py",
 "vpn_ipsec.py",
 "vpn_l2tp.py",
 "vpn_openconnect.py",
 "vpn_pptp.py",
 "vpn_sstp.py",
 "vrf.py",
 "vrf_vni.py"
 ]
diff --git a/interface-definitions/service_aws_glb.xml.in b/interface-definitions/service_aws_glb.xml.in
deleted file mode 100644
index c749fd04e..000000000
--- a/interface-definitions/service_aws_glb.xml.in
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0"?>
-<interfaceDefinition>
-  <node name="service">
-    <children>
-      <node name="aws">
-        <properties>
-          <help>Amazon Web Service</help>
-          <priority>1280</priority>
-        </properties>
-        <children>
-          <node name="glb" owner="${vyos_conf_scripts_dir}/service_aws_glb.py">
-            <properties>
-              <help>Gateway load-balancer tunnel handler</help>
-            </properties>
-            <children>
-              <node name="script">
-                <properties>
-                  <help>Script executed on create or destroy tunnel</help>
-                </properties>
-                <children>
-                  <leafNode name="on-create">
-                    <properties>
-                      <help>Script to run when interface is created</help>
-                      <constraint>
-                        <validator name="script"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="on-destroy">
-                    <properties>
-                      <help>Script to run when interface is destroyed</help>
-                      <constraint>
-                        <validator name="script"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                </children>
-              </node>
-              <node name="status">
-                <properties>
-                  <help>Status</help>
-                </properties>
-                <children>
-                  <leafNode name="format">
-                    <properties>
-                      <help>Statistic format</help>
-                      <completionHelp>
-                        <list>simple full</list>
-                      </completionHelp>
-                      <valueHelp>
-                        <format>simple</format>
-                        <description>Simple format</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>full</format>
-                        <description>Full format</description>
-                      </valueHelp>
-                      <constraint>
-                        <regex>(simple|full)</regex>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                  #include <include/port-number.xml.i>
-                </children>
-              </node>
-              <node name="threads">
-                <properties>
-                  <help>Threads settings</help>
-                </properties>
-                <children>
-                  <leafNode name="tunnel">
-                    <properties>
-                      <help>Number of threads for each tunnel processor</help>
-                      <valueHelp>
-                        <format>u32:1-256</format>
-                        <description>Number of threads</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 1-256"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="tunnel-affinity">
-                    <properties>
-                      <help>List of cores worker threads</help>
-                      <valueHelp>
-                        <format>&lt;idN&gt;-&lt;idM&gt;</format>
-                        <description>CPU core id range (use '-' as delimiter)</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--allow-range --range 0-255"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="udp">
-                    <properties>
-                      <help>Number of threads for UDP receiver</help>
-                      <valueHelp>
-                        <format>u32:1-256</format>
-                        <description>Number of threads</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--range 1-256"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="udp-affinity">
-                    <properties>
-                      <help>List of cores worker threads</help>
-                      <valueHelp>
-                        <format>&lt;idN&gt;-&lt;idM&gt;</format>
-                        <description>CPU core id range (use '-' as delimiter)</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="numeric" argument="--allow-range --range 0-255"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                </children>
-              </node>
-            </children>
-          </node>
-        </children>
-      </node>
-    </children>
-  </node>
-</interfaceDefinition>