diff --git a/README.rst b/README.rst
index 6fd2aa2..c970cb6 100644
--- a/README.rst
+++ b/README.rst
@@ -46,8 +46,6 @@
     haproxy:
       proxy:
         enabled: True
-        mode: http/tcp
-        logging: syslog
         maxconn: 1024
         timeout:
           connect: 5000
@@ -75,8 +73,6 @@
     haproxy:
       proxy:
         enabled: True
-        mode: http/tcp
-        logging: syslog
         maxconn: 1024
         timeout:
           connect: 5000
@@ -101,9 +97,6 @@
       haproxy:
         proxy:
           enabled: true
-          mode: tcp
-          logging: syslog
-          max_connections: 1024
           listen:
             mysql:
               type: mysql
@@ -157,9 +150,6 @@
       haproxy:
         proxy:
           enabled: true
-          mode: tcp
-          logging: syslog
-          max_connections: 1024
           listen:
             mysql:
               type: mysql
@@ -476,9 +466,6 @@
   haproxy:
     proxy:
       enabled: true
-      mode: tcp
-      logging: syslog
-      max_connections: 1024
       forwardfor:
         enabled: true
         except:
@@ -490,9 +477,6 @@
   haproxy:
     proxy:
       enabled: true
-      mode: tcp
-      logging: syslog
-      max_connections: 1024
       forwardfor:
         enabled: true
         except: 127.0.0.1
@@ -513,8 +497,6 @@
         3: 2
         4: 3
       stats_bind_process: "1 2"
-      mode: http/tcp
-      logging: syslog
       maxconn: 1024
       timeout:
         connect: 5000
diff --git a/metadata/service/proxy/single.yml b/metadata/service/proxy/single.yml
index 87896eb..5eb9a4a 100644
--- a/metadata/service/proxy/single.yml
+++ b/metadata/service/proxy/single.yml
@@ -6,6 +6,3 @@
   haproxy:
     proxy:
       enabled: true
-      mode: tcp
-      logging: syslog
-      max_connections: 1024
diff --git a/tests/pillar/single.sls b/tests/pillar/single.sls
index 0129244..1872d35 100644
--- a/tests/pillar/single.sls
+++ b/tests/pillar/single.sls
@@ -3,6 +3,3 @@
     enabled: true
     forwardfor:
       enabled: true
-    mode: tcp
-    logging: syslog
-    max_connections: 1024
diff --git a/tests/pillar/single_contrail.sls b/tests/pillar/single_contrail.sls
index 87ff43f..bfd2bbd 100644
--- a/tests/pillar/single_contrail.sls
+++ b/tests/pillar/single_contrail.sls
@@ -1,9 +1,6 @@
 haproxy:
   proxy:
     enabled: true
-    mode: tcp
-    logging: syslog
-    max_connections: 1024
     listen:
       contrail_analytics:
         type: contrail-analytics
diff --git a/tests/pillar/single_contrail_workers.sls b/tests/pillar/single_contrail_workers.sls
index d432528..2dca6fd 100644
--- a/tests/pillar/single_contrail_workers.sls
+++ b/tests/pillar/single_contrail_workers.sls
@@ -1,9 +1,6 @@
 haproxy:
   proxy:
     enabled: true
-    mode: tcp
-    logging: syslog
-    max_connections: 1024
     listen:
       contrail_analytics:
         type: contrail-analytics
diff --git a/tests/pillar/single_forwardfor.sls b/tests/pillar/single_forwardfor.sls
index 2c78c52..e11ba62 100644
--- a/tests/pillar/single_forwardfor.sls
+++ b/tests/pillar/single_forwardfor.sls
@@ -6,6 +6,3 @@
       except: 127.0.0.1
       header: X-Custom-Header
       if-none: true
-    mode: tcp
-    logging: syslog
-    max_connections: 1024
diff --git a/tests/pillar/single_general_service.sls b/tests/pillar/single_general_service.sls
index 8480b03..244655c 100644
--- a/tests/pillar/single_general_service.sls
+++ b/tests/pillar/single_general_service.sls
@@ -1,9 +1,6 @@
 haproxy:
   proxy:
     enabled: true
-    mode: tcp
-    logging: syslog
-    max_connections: 1024
     nbproc: 4
     global:
       maxconn: 99999
diff --git a/tests/pillar/single_openstack_service.sls b/tests/pillar/single_openstack_service.sls
index 9e2ec2f..03ae1ed 100644
--- a/tests/pillar/single_openstack_service.sls
+++ b/tests/pillar/single_openstack_service.sls
@@ -1,9 +1,6 @@
 haproxy:
   proxy:
     enabled: true
-    mode: tcp
-    logging: syslog
-    max_connections: 1024
     listen:
       cinder_api:
         type: openstack-service
diff --git a/tests/pillar/single_rate_limiting.sls b/tests/pillar/single_rate_limiting.sls
index 0b6ae8b..33afe61 100644
--- a/tests/pillar/single_rate_limiting.sls
+++ b/tests/pillar/single_rate_limiting.sls
@@ -1,9 +1,6 @@
 haproxy:
   proxy:
     enabled: true
-    mode: tcp
-    logging: syslog
-    max_connections: 1024
     listen:
       nova_metadata_api:
         binds: