diff --git a/other-requirements.txt b/bindep.txt
similarity index 100%
rename from other-requirements.txt
rename to bindep.txt
diff --git a/opencontrail/compute.sls b/opencontrail/compute.sls
index f2f6ca1..8d3d063 100644
--- a/opencontrail/compute.sls
+++ b/opencontrail/compute.sls
@@ -14,16 +14,6 @@
   pkg.installed:
   - names: {{ compute.pkgs }}
 
-{%- if grains.os_family == "Debian" %}
-
-/etc/network/if-pre-up.d/if-vhost0:
-  file.symlink:
-    - target: /usr/lib/contrail/if-vhost0
-    - require:
-      - pkg: opencontrail_compute_packages
-
-{%- endif %}
-
 net.ipv4.ip_local_reserved_ports:
   sysctl.present:
     - value: 8085,9090
diff --git a/opencontrail/config.sls b/opencontrail/config.sls
index 9b2006f..91425c1 100644
--- a/opencontrail/config.sls
+++ b/opencontrail/config.sls
@@ -122,6 +122,10 @@
   - template: jinja
   - require:
     - pkg: opencontrail_config_packages
+{%- if not grains.get('noservices', False) %}
+  - watch_in:
+    - service: opencontrail_config_services
+{%- endif %}
 {%- endif %}
 
 /etc/contrail/contrail-schema.conf:
@@ -188,7 +192,6 @@
     - file: /etc/contrail/contrail-api.conf
     - file: /etc/contrail/vnc_api_lib.ini
     - file: /etc/ifmap-server/basicauthusers.properties
-    - file: /etc/contrail/contrail-keystone-auth.conf
     - file: /etc/sudoers.d/contrail_sudoers
 
 {%- endif %}