diff --git a/puppet/files/etc_profile.d/java.sh b/puppet/files/etc_profile.d/java.sh
index 925dbbcb25..e69de29bb2 100644
--- a/puppet/files/etc_profile.d/java.sh
+++ b/puppet/files/etc_profile.d/java.sh
@@ -1,2 +0,0 @@
-export JAVA_HOME=/data/jdk1.7.0_03
-export PATH=$JAVA_HOME/bin:$PATH
diff --git a/puppet/manifests/classes/socorro-base.pp b/puppet/manifests/classes/socorro-base.pp
index 4716e380a5..f5aa9a7d84 100644
--- a/puppet/manifests/classes/socorro-base.pp
+++ b/puppet/manifests/classes/socorro-base.pp
@@ -53,18 +53,12 @@
 	    notify => Service[rsyslog],
 	    source => "/home/socorro/dev/socorro/puppet/files/rsyslog.conf";
 
-	 'hbase-configs':
-            path => "/etc/hbase/conf/",
-            recurse => true,
-            require => Exec['install-hbase'],
-            source => "/home/socorro/dev/socorro/puppet/files/etc_hbase_conf";
-
 # FIXME break this out to separate classes
 	 'etc_supervisor':
             path => "/etc/supervisor/conf.d/",
             recurse => true,
             require => [Package['supervisor'], Exec['socorro-install']],
-	    notify => Service[supervisor],
+	    #notify => Service[supervisor],
             source => "/home/socorro/dev/socorro/puppet/files/etc_supervisor";
 
         '/var/log/socorro':
@@ -96,30 +90,23 @@
             creates => '/tmp/apt-get-update';
     }
 
-    exec {
-        '/usr/bin/curl http://download.oracle.com/otn-pub/java/jdk/7u3-b04/jdk-7u3-linux-x64.tar.gz | tar -C /data -zxf -':
-            alias => 'install-oracle-jdk',
-            creates => '/data/jdk1.7.0_03/',
-            require => Package['curl'];
-    }   
-
     package {
         ['rsyslog', 'libcurl4-openssl-dev', 'libxslt1-dev', 'build-essential',
          'supervisor', 'ant', 'python-software-properties', 'python-pip',
-         'curl', 'git-core', 'openjdk-6-jre-headless']:
+         'curl', 'git-core', 'openjdk-6-jdk']:
             ensure => latest,
             require => Exec['apt-get-update'];
     }
 
     service {
-        supervisor:
-            enable => true,
-            stop => '/usr/bin/service supervisor force-stop',
-            hasstatus => true,
-            require => [Package['supervisor'], Service['postgresql'],
-                        Exec['setup-schema'], Exec['hbase-schema']],
-            subscribe => Exec['socorro-install'],
-            ensure => running;
+#        supervisor:
+#            enable => true,
+#            stop => '/usr/bin/service supervisor force-stop',
+#            hasstatus => true,
+#            require => [Package['supervisor'], Service['postgresql'],
+#                        Exec['setup-schema']],
+#            subscribe => Exec['socorro-install'],
+#            ensure => running;
 
         rsyslog:
             enable => true,
@@ -206,8 +193,7 @@
             timeout => '3600',
             require => Exec['socorro-install'],
             logoutput => on_failure,
-            notify => [Service['supervisor'], Service['apache2'],
-                       Service['memcached']],
+            notify => [Service['apache2'], Service['memcached']],
             user => 'socorro';
     }
 }
diff --git a/puppet/manifests/classes/socorro-db.pp b/puppet/manifests/classes/socorro-db.pp
index 898af525a2..5f1137581b 100644
--- a/puppet/manifests/classes/socorro-db.pp
+++ b/puppet/manifests/classes/socorro-db.pp
@@ -97,7 +97,7 @@
             alias => 'dataload',
             user => 'postgres',
             cwd => '/home/socorro/dev/socorro/tools/dataload/',
-            onlyif => '/usr/bin/psql -xt breakpad -c "SELECT count(*) FROM reports" | grep "count | 0"',
+            onlyif => '/usr/bin/psql -xt breakpad -c "SELECT count(*) FROM products" | grep "count | 0"',
             logoutput => on_failure,
             require => Exec['setup-schema'];
     }
diff --git a/puppet/manifests/classes/socorro-elasticsearch.pp b/puppet/manifests/classes/socorro-elasticsearch.pp
index b3c4f25a4c..fcdb1b6cb9 100644
--- a/puppet/manifests/classes/socorro-elasticsearch.pp
+++ b/puppet/manifests/classes/socorro-elasticsearch.pp
@@ -8,7 +8,7 @@
     }
 
     package { "elasticsearch":
-        require => [Package["openjdk-6-jre-headless"], Exec["download-elasticsearch"]],
+        require => [Package["openjdk-6-jdk"], Exec["download-elasticsearch"]],
         source => "/home/socorro/elasticsearch-${es_version}.deb",
         provider => dpkg,
         ensure => latest;
diff --git a/puppet/manifests/init.pp b/puppet/manifests/init.pp
index 1d280696a0..476d4abe0d 100644
--- a/puppet/manifests/init.pp
+++ b/puppet/manifests/init.pp
@@ -1,8 +1,4 @@
-Exec { path => ["/data/jdk1.7.0_03/bin", "/bin", "/sbin", "/usr/bin",
-                "/usr/sbin", "/usr/local/bin", "/usr/local/sbin"],
-       environment => "JAVA_HOME=/data/jdk1.7.0_03/",
-       logoutput => on_failure
-}
+Exec { logoutput => on_failure }
 
 import "classes/*"
 import "nodes/*"
diff --git a/puppet/manifests/nodes/nodes.pp b/puppet/manifests/nodes/nodes.pp
index 6683f9e82c..6ef6438184 100644
--- a/puppet/manifests/nodes/nodes.pp
+++ b/puppet/manifests/nodes/nodes.pp
@@ -5,6 +5,6 @@
     include socorro-processor
     include socorro-collector
     include socorro-api
-    include socorro-hbase
+#    include socorro-hbase
     include socorro-elasticsearch
 }