diff --git a/lib/refrepo/gen/puppet/templates/kavlan.conf.erb b/lib/refrepo/gen/puppet/templates/kavlan.conf.erb
index dd4986389d0063ab6f6be0443d98495d666033cb..eb996204edc12955a047c97701059a404ed12a80 100644
--- a/lib/refrepo/gen/puppet/templates/kavlan.conf.erb
+++ b/lib/refrepo/gen/puppet/templates/kavlan.conf.erb
@@ -39,13 +39,6 @@
 <%
        end
 
-       if site_refapi['kavlans'].has_key?('topo')
-         Range.new(*site_refapi['kavlans']['topo'].split("..").map{|d| Integer(d)}).each do |kavlan_topo_id| -%>
-       {"value": <%= kavlan_topo_id %>, "name": "KAVLAN-<%= kavlan_topo_id %>", "type": "kavlan-topo"},
-<%
-         end
-       end
-
        if site_refapi.has_key?('kavlan_nef') -%>
        {"value": <%= site_refapi['kavlan_nef'] %>, "name": "NEF", "type": "NULL"},
 <%
diff --git a/lib/refrepo/gen/reference-api.rb b/lib/refrepo/gen/reference-api.rb
index 61c3ec4f08a80e0ecb666bc3bf13d723baf6dad6..6b1b8065833e2cdb13239676a2ef77e95f42dc89 100644
--- a/lib/refrepo/gen/reference-api.rb
+++ b/lib/refrepo/gen/reference-api.rb
@@ -74,11 +74,6 @@ def generate_reference_api
     site["type"] = "site"
     site["uid"]  = site_uid
 
-    #Move special entry "kavlan_topo"
-    if site["kavlan_topo"]
-      site["kavlans"]["topo"] = site.delete("kavlan_topo")
-    end
-
     site_path = Pathname.new(refapi_path).join("sites", site_uid)
     site_path.mkpath()
 
diff --git a/lib/refrepo/valid/input/schemas/schema-site.yaml b/lib/refrepo/valid/input/schemas/schema-site.yaml
index f9120dc271ec1119b68d7a0da0e710dac1eebad0..3c98d584232e6bdf278264cb6f193486cc31d690 100644
--- a/lib/refrepo/valid/input/schemas/schema-site.yaml
+++ b/lib/refrepo/valid/input/schemas/schema-site.yaml
@@ -66,7 +66,6 @@ kavlans:
     network_ipv6: ipv6_network
     gateway_ipv6: optional_ipv6_address
 kavlan_ip_range: ipv4_network
-kavlan_topo: optional_string
 kavlan_nef: optional_integer
 pdus:
   <optional_hash>:
@@ -86,4 +85,4 @@ frontend_ip: ipv4_address
 ipv6:
   prefix: ipv6_network
   site_global_kavlan: integer
-  site_index: integer
\ No newline at end of file
+  site_index: integer