diff --git a/src/mpi/AITuning_OpenCoarrays.cpp b/src/mpi/AITuning_OpenCoarrays.cpp
deleted file mode 100644
index 6d93146c3..000000000
--- a/src/mpi/AITuning_OpenCoarrays.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-#include "mpi.h"
-#include <string>
-#include <iostream>
-#include <time.h>
-#include "Probes.h"
-#include "Variables.h"
-#include "Controller.h"
-
-using namespace std;
-
-double start_time, start_get, start_put, start_collective, start_barrier;
-static int n_procs, my_id;
-
-static SingleProbe *total_time_p;
-
-int MPI_Init_thread(int *argc, char ***argv, int required, int *provided)
-{
-  int provided_t, err = -1;
-  bool async_on = false;
-
-  AITuning_start("MPICH");
-  UserDefinedPerformanceVar *total_time_v = new UserDefinedPerformanceVar((char*)"total_time",(char*)"total_time_log.txt");
-  AITuning_addUserDefinedPerformanceVar(total_time_v);
-  total_time_p = new SingleProbe((char*)"total_time_probe", total_time_v);
-
-  err = PMPI_Init_thread(argc, argv, required, provided);
-
-  MPI_Comm_size(MPI_COMM_WORLD, &n_procs);
-  MPI_Comm_rank(MPI_COMM_WORLD, &my_id);
-  
-  start_time = MPI_Wtime();
-  
-  return err;
-}
-
-int MPI_Finalize(void){
-
-  int err = -1;
-  double end_time,average,total_time,elapsed_time;
-
-  end_time = MPI_Wtime();
-
-  elapsed_time = end_time - start_time;
-
-  MPI_Reduce(&elapsed_time, &total_time, 1, MPI_DOUBLE, MPI_SUM, 0, MPI_COMM_WORLD);
-
-  total_time = total_time/n_procs;
-
-  printf("Registring value in probe\n");
-  total_time_p->registerValue(total_time);
-
-  err = PMPI_Finalize();
-  
-  return err;
-}
diff --git a/src/mpi/Makefile b/src/mpi/Makefile
index 949b173c3..d997295ce 100644
--- a/src/mpi/Makefile
+++ b/src/mpi/Makefile
@@ -1,26 +1,21 @@
 include ../make.inc
 
 MPICC ?= mpicc
-MPIC++ ?= mpic++
-AITUNING_DIR = ./AITuning/lib/libaituning.a
-AITUNING_LIB = 
 
-libcaf_mpi.a: mpi_caf.o AITuning_OpenCoarrays.o ../common/caf_auxiliary.o
-	ar rcv $@ mpi_caf.o AITuning_OpenCoarrays.o ../common/caf_auxiliary.o
+libcaf_mpi.a: mpi_caf.o ../common/caf_auxiliary.o
+	ar rcv $@ mpi_caf.o ../common/caf_auxiliary.o
 	ranlib $@
 
 .c.o:
 	$(MPICC) $(CFLAGS) $(MPI_CFLAGS) -I.. -c $< -o $@
-.cpp.o:
-	$(MPIC++) $(CFLAGS) $(MPI_CFLAGS) -I.. -I./AITuning/include -c $< -o $@
 
-mpi_caf.o: mpi_caf.c AITuning_OpenCoarrays.o ../libcaf.h ../libcaf-gfortran-descriptor.h $(AITUNING_DIR) $(AITUNING_LIB)
+mpi_caf.o: mpi_caf.c ../libcaf.h ../libcaf-gfortran-descriptor.h
 
 ../common/caf_auxiliary.o:
 	$(MAKE) -C ../common
 
 clean:
-	rm -f *.o
+	rm -f mpi_caf.o
 
 distclean: clean
 	rm -f libcaf_mpi.a