diff --git a/src/auxval.F90 b/src/auxval.F90
index c49fc47eff29195904ab50932b0a2e57a89af892..0ef6890bd1b1f0ec7cf68fa0a247f6098f56f582 100644
--- a/src/auxval.F90
+++ b/src/auxval.F90
@@ -12,18 +12,13 @@ subroutine auxval
   IF (my_id .EQ. 0) WRITE(*,*) '=== Set auxiliary values ==='
 
   CALL init_grid_distr_and_plans(Nr,Nz)
-  CALL mpi_barrier(MPI_COMM_WORLD, ierr)
 
   CALL set_krgrid
-  CALL mpi_barrier(MPI_COMM_WORLD, ierr)
 
   CALL set_kzgrid ! Distributed dimension
-  CALL mpi_barrier(MPI_COMM_WORLD, ierr)
 
   CALL set_pj
-  CALL mpi_barrier(MPI_COMM_WORLD, ierr)
 
   CALL memory ! Allocate memory for global arrays
-  CALL mpi_barrier(MPI_COMM_WORLD, ierr)
 
 END SUBROUTINE auxval
diff --git a/src/control.F90 b/src/control.F90
index 704fa618444c7dff1578829be6d1c0f5eae8e778..4522733f7dbf59b5614c9bf2b9bc1e163253fae6 100644
--- a/src/control.F90
+++ b/src/control.F90
@@ -21,36 +21,26 @@ SUBROUTINE control
   CALL basic_data
   IF (my_id .EQ. 1) WRITE(*,'(a/)') '...basic data loaded.'
 
-  ! CALL mpi_barrier(MPI_COMM_WORLD, ierr)
-
   !                   1.3   Read input parameters from input file
   IF (my_id .EQ. 1) WRITE(*,*) 'Read input parameters...'
   CALL readinputs
   IF (my_id .EQ. 1) WRITE(*,'(a/)') '...input parameters read'
 
-  ! CALL mpi_barrier(MPI_COMM_WORLD, ierr)
-
   !                   1.4     Set auxiliary values (allocate arrays, set grid, ...)
   IF (my_id .EQ. 1) WRITE(*,*) 'Calculate auxval...'
   CALL auxval
   IF (my_id .EQ. 1) WRITE(*,'(a/)') '...auxval calculated'
 
-  ! CALL mpi_barrier(MPI_COMM_WORLD, ierr)
-
   !                   1.5     Initial conditions
   IF (my_id .EQ. 1) WRITE(*,*) 'Create initial state...'
   CALL inital
   IF (my_id .EQ. 1) WRITE(*,'(a/)') '...initial state created'
 
-  ! CALL mpi_barrier(MPI_COMM_WORLD, ierr)
-
   !                   1.6     Initial diagnostics
   IF (my_id .EQ. 1) WRITE(*,*) 'Initial diagnostics...'
   CALL diagnose(0)
   IF (my_id .EQ. 1) WRITE(*,'(a/)') '...initial diagnostics done'
 
-  ! CALL mpi_barrier(MPI_COMM_WORLD, ierr)
-
   CALL FLUSH(stdout)
   !________________________________________________________________________________
 
@@ -64,7 +54,6 @@ CALL cpu_time(t0_step) ! Measuring time
      cstep = cstep + 1
 
      CALL stepon
-     CALL mpi_barrier(MPI_COMM_WORLD, ierr)
 
      time  = time  + dt
 
diff --git a/src/diagnose.F90 b/src/diagnose.F90
index 9a7bf995f0e1d4d0a18a4e90d91b66df3970e5f5..c8e2df7ee4bb43cff2bcb4fed2982aba61f48927 100644
--- a/src/diagnose.F90
+++ b/src/diagnose.F90
@@ -273,7 +273,7 @@ SUBROUTINE diagnose(kstep)
      !   Close all diagnostic files
      CALL closef(fidres)
      CALL closef(fidrst)
-     CALL mpi_barrier(MPI_COMM_WORLD, ierr)
+     
   END IF
 
 END SUBROUTINE diagnose
diff --git a/src/fourier_mod.F90 b/src/fourier_mod.F90
index 94aedfbaa6caaaa7811f02f5d0043c9158052d6c..102476197853ec8ed554b56ca4b16c245fed1835 100644
--- a/src/fourier_mod.F90
+++ b/src/fourier_mod.F90
@@ -62,8 +62,6 @@ MODULE fourier
      CALL mpi_barrier(MPI_COMM_WORLD, ierr)
      IF (my_id .EQ. ix) print *, my_id,': alloc_local = ', alloc_local_1+alloc_local_2
      CALL mpi_barrier(MPI_COMM_WORLD, ierr)
-     ! IF (my_id .EQ. 0) print *, my_id,': local_nz = ', local_nz, ' loc_nz_of. = ', local_nz_offset
-     ! CALL mpi_barrier(MPI_COMM_WORLD, ierr)
    ENDDO
 
 
diff --git a/src/stepon.F90 b/src/stepon.F90
index 986435d707709162307e13cbff549f29e3592770..f79f0be12ae0ee680fdeedebb8d607d31aa50a6f 100644
--- a/src/stepon.F90
+++ b/src/stepon.F90
@@ -50,7 +50,8 @@ SUBROUTINE stepon
 
       !(The two routines above are called in inital for t=0)
       CALL checkfield_all()
-      CALL mpi_barrier(MPI_COMM_WORLD, ierr)
+      IF( nlend ) EXIT ! exit do loop
+
    END DO
 
    CONTAINS