diff --git a/baremetal_simulator/init.sls b/baremetal_simulator/init.sls
index ec8abbe..1cfdfa4 100644
--- a/baremetal_simulator/init.sls
+++ b/baremetal_simulator/init.sls
@@ -9,7 +9,7 @@
   pip.installed:
     - names: {{ baremetal_simulator.pip_pkgs }}
     - require:
-      - pkg: python-pip
+      - simulator_pkgs
 
 libvirt-bin:
   service.running:
@@ -30,28 +30,6 @@
   file.directory:
     - makedirs: true
 
-deploy_ramdisk:
-  file.managed:
-    - name: {{ baremetal_simulator.http_root }}/{{ baremetal_simulator.deploy_ramdisk_file }}
-    - source: {{ baremetal_simulator.deploy_ramdisk_ref }}
-    - skip_verify: true
-
-deploy_kernel:                                                                                                                                                                              
-  file.managed:                                                                                                                                                          
-    - name: {{ baremetal_simulator.http_root }}/{{ baremetal_simulator.deploy_kernel_file }}
-    - source: {{ baremetal_simulator.deploy_kernel_ref }}
-    - skip_verify: true
-
-{%- if baremetal_simulator.cirros_image_ref is defined %}
-
-{{ baremetal_simulator.cirros_image_name }}_file:
-  file.managed:
-    - name: {{ baremetal_simulator.http_root }}/{{ baremetal_simulator.cirros_image_name }}
-    - source: {{ baremetal_simulator.cirros_image_ref }}
-    - skip_verify: true
-
-{%- endif %}
-
 {%- for identity_name, nodes in bs_nodes.iteritems() %}
   {%- for node in nodes %}
 
diff --git a/baremetal_simulator/map.jinja b/baremetal_simulator/map.jinja
index 1ef3600..f3e7993 100644
--- a/baremetal_simulator/map.jinja
+++ b/baremetal_simulator/map.jinja
@@ -1,6 +1,6 @@
 {% set baremetal_simulator = salt['grains.filter_by']({
     'Common': {
-        'pkgs': ['python-pip', 'openvswitch-switch', 'libvirt-bin'],
+        'pkgs': ['python-pip', 'openvswitch-switch', 'python-libvirt', 'libvirt-bin', 'pkg-config'],
         'pip_pkgs': ['virtualbmc'],
     }
 }, base='Common', merge=pillar.get('baremetal_simulator', {})) %}