added hadoop and removed some stuff