diff --git a/ubuntu-openmpi.def b/ubuntu-openmpi.def
index d09466fa03b3251b2d138d35092faaeda891aaf9..24aa814598df98bbdddfff7c2351c9cedd06089d 100644
--- a/ubuntu-openmpi.def
+++ b/ubuntu-openmpi.def
@@ -188,9 +188,7 @@ Namespace: amd64
         
     if [ ! -d tensorflow ]; then
         git clone https://github.com/tensorflow/tensorflow
-    fi
-    
-    #TF
+        
         cd tensorflow
    
         git checkout v1.6.0
@@ -217,21 +215,10 @@ Namespace: amd64
         ./configure
     
     
-        #bazel build --cxxopt="-D_GLIBCXX_USE_CXX11_ABI=0" --config=opt --config=cuda //tensorflow/tools/pip_package:build_pip_package
-        chmod -R a+rwX ./
-        rm -r bazel-bin bazel-genfiles bazel-tensorflow bazel-out bazel-testlogs
-        
-        
-    #pip3 install /tmp/tensorflow_pkg/*.whl
-     
-     
-     
-    # https://gist.github.com/PatWie/0c915d5be59a518f934392219ca65c3d
-    # export TF_NEED_CUDA=1
-    # export TF_NEED_MPI=1
-    # TODO CUDNN
-    #/apps/bazel/output/bazel
-
+        bazel build --cxxopt="-D_GLIBCXX_USE_CXX11_ABI=0" --config=opt --config=cuda //tensorflow/tools/pip_package:build_pip_package
+        bazel-bin/tensorflow/tools/pip_package/build_pip_package /tmp/tensorflow_pkg
+        pip3 install /tmp/tensorflow_pkg/*.whl
+    fi
 
 %environment
     export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/cuda/extras/CUPTI/lib64:/apps/tensorflow-dep/cuda/lib64