diff --git a/manifests/init.pp b/manifests/init.pp
index 2a4c8a3c..5c14035b 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -139,14 +139,10 @@
 #  [*neutron_options*]
 #    (optional) A hash of parameters to enable features specific to
 #    Neutron.  These include:
-#    'enable_firewall': Boolean to enable or disable Neutron's FWaaS feature.
-#      Defaults to False.
 #    'enable_quotas': Boolean to enable or disable Neutron quotas.
 #      Defaults to True.
 #    'enable_security_group': Boolean to enable or disable Neutron
 #      security groups.  Defaults to True.
-#    'enable_vpn': Boolean to enable or disable Neutron's VPNaaS feature.
-#      Defaults to False.
 #    'enable_distributed_router': Boolean to enable or disable Neutron
 #      distributed virtual router (DVR) feature in the Router panel.
 #      Defaults to False.
@@ -626,11 +622,8 @@ release. Use log_handlers instead')
   # be merged with user-provided options when the local_settings.py.erb
   # template is interpolated.
   $neutron_defaults = {
-    'enable_lb'                 => false,
-    'enable_firewall'           => false,
     'enable_quotas'             => true,
     'enable_security_group'     => true,
-    'enable_vpn'                => false,
     'enable_distributed_router' => false,
     'enable_ha_router'          => false,
     'profile_support'           => 'None',
diff --git a/spec/classes/horizon_init_spec.rb b/spec/classes/horizon_init_spec.rb
index 2d0d5831..0f3c3e6c 100644
--- a/spec/classes/horizon_init_spec.rb
+++ b/spec/classes/horizon_init_spec.rb
@@ -69,12 +69,9 @@ describe 'horizon' do
           "    'can_set_mount_point': True,",
           "    'can_set_password': False,",
           "    'enable_distributed_router': False,",
-          "    'enable_firewall': False,",
           "    'enable_ha_router': False,",
-          "    'enable_lb': False,",
           "    'enable_quotas': True,",
           "    'enable_security_group': True,",
-          "    'enable_vpn': False,",
           'API_RESULT_LIMIT = 1000',
           'DROPDOWN_MAX_ITEMS = 30',
           'TIME_ZONE = "UTC"',
@@ -118,7 +115,7 @@ describe 'horizon' do
           :hypervisor_options             => {'can_set_mount_point' => false, 'can_set_password' => true },
           :cinder_options                 => {'enable_backup' => true },
           :keystone_options               => {'name' => 'native', 'can_edit_user' => true, 'can_edit_group' => true, 'can_edit_project' => true, 'can_edit_domain' => false, 'can_edit_role' => false},
-          :neutron_options                => {'enable_lb' => true, 'enable_firewall' => true, 'enable_quotas' => false, 'enable_security_group' => false, 'enable_vpn' => true,
+          :neutron_options                => {'enable_quotas' => false, 'enable_security_group' => false,
                                             'enable_distributed_router' => false, 'enable_ha_router' => false, 'profile_support' => 'cisco',
                                             'supported_provider_types' => ['flat', 'vxlan'], 'supported_vnic_types' => ['*'], 'default_ipv4_subnet_pool_label' => 'None', },
           :instance_options               => {'disable_image' => true, 'disable_instance_snapshot' => true, 'disable_volume' => true, 'disable_volume_snapshot' => true, 'create_volume' => false },
@@ -183,11 +180,8 @@ describe 'horizon' do
           "    'can_set_password': True,",
           "    'enable_backup': True,",
           "    'default_ipv4_subnet_pool_label': None,",
-          "    'enable_firewall': True,",
-          "    'enable_lb': True,",
           "    'enable_quotas': False,",
           "    'enable_security_group': False,",
-          "    'enable_vpn': True,",
           "    'profile_support': 'cisco',",
           "    'supported_provider_types': ['flat', 'vxlan'],",
           "    'supported_vnic_types': ['*'],",
diff --git a/templates/local_settings.py.erb b/templates/local_settings.py.erb
index 63eb4177..22b45785 100644
--- a/templates/local_settings.py.erb
+++ b/templates/local_settings.py.erb
@@ -439,9 +439,6 @@ LAUNCH_INSTANCE_DEFAULTS = {
 #    'enable_ipv6': True,
 #    'enable_distributed_router': False,
 #    'enable_ha_router': False,
-#    'enable_lb': True,
-#    'enable_firewall': True,
-#    'enable_vpn': True,
 #    'enable_fip_topology_check': True,
 
     # Neutron can be configured with a default Subnet Pool to be used for IPv4