diff --git a/src/associate_mesh_ass.h b/src/associate_mesh_ass.h
index 036baa2d4..2e6366874 100644
--- a/src/associate_mesh_ass.h
+++ b/src/associate_mesh_ass.h
@@ -64,9 +64,7 @@ hnode(1:mesh%nl-1, 1:myDim_nod2D+eDim_nod2D)               => mesh%hnode(:,:)
 hnode_new(1:mesh%nl-1, 1:myDim_nod2D+eDim_nod2D)           => mesh%hnode_new(:,:)
 zbar_3d_n(1:mesh%nl, 1:myDim_nod2D+eDim_nod2D)             => mesh%zbar_3d_n(:,:)
 Z_3d_n(1:mesh%nl-1, 1:myDim_nod2D+eDim_nod2D)              => mesh%Z_3d_n(:,:)
-#if defined(__async_icebergs)
 Z_3d_n_ib(1:mesh%nl-1, 1:myDim_nod2D+eDim_nod2D)           => mesh%Z_3d_n_ib(:,:)
-#endif
 helem(1:mesh%nl-1, 1:myDim_elem2D+eDim_elem2D)             => mesh%helem(:,:)
 bottom_elem_thickness(1:myDim_elem2D+eDim_elem2D)          => mesh%bottom_elem_thickness(:)
 bottom_node_thickness(1:myDim_nod2D+eDim_nod2D)            => mesh%bottom_node_thickness(:)
diff --git a/src/cpl_driver.F90 b/src/cpl_driver.F90
index a26b842f2..d5ab69c69 100644
--- a/src/cpl_driver.F90
+++ b/src/cpl_driver.F90
@@ -60,11 +60,11 @@ module cpl_driver
   integer                    :: commRank
   integer                    :: comp_id        ! id returned by oasis_init_comp
 
-  logical, save              :: oasis_was_initialized
-  logical, save              :: oasis_was_terminated
-  integer, save              :: write_grid
+  logical                    :: oasis_was_initialized
+  logical                    :: oasis_was_terminated
+  integer                    :: write_grid
 
-  integer, save              :: seconds_til_now=0
+  integer                    :: seconds_til_now=0
   integer                    :: ierror              ! return error code
   logical                    :: rootexchg   =.true. ! logical switch 
 
@@ -893,7 +893,7 @@ subroutine cpl_oasis3mct_recv(ind, data_array, action, partit)
     !
     integer                :: info
     integer                :: j
-    integer, save          :: ncount = 0
+    integer                :: ncount = 0
     real (kind=WP)         :: t1, t2, t3        
     !
     !--------------------------------------------------------------------
diff --git a/src/gen_forcing_couple.F90 b/src/gen_forcing_couple.F90
index 67ba51c43..3e7e85d4a 100755
--- a/src/gen_forcing_couple.F90
+++ b/src/gen_forcing_couple.F90
@@ -34,7 +34,7 @@ subroutine integrate_2D(flux_global, flux_local, eff_vol, field2d, mask, partit,
       USE MOD_PARTIT
       USE MOD_PARSUP
       type(t_mesh),   intent(in),    target :: mesh
-      type(t_partit), intent(inout), target :: partit
+      type(t_partit), intent(in), target :: partit
       real(kind=WP), intent (out) :: flux_global(2), flux_local(2)
       real(kind=WP), intent (out) :: eff_vol(2)
       real(kind=WP), intent (in)  :: field2d(partit%myDim_nod2D+partit%eDim_nod2D)
@@ -211,7 +211,7 @@ subroutine update_atm_forcing(istep, ice, tracers, dynamics, partit, mesh)
               end do
             else    
             print *, 'not installed yet or error in cpl_oasis3mct_send', mype
-#else   ! oifs
+#else
             ! AWI-CM2 outgoing state vectors
             do n=1,myDim_nod2D+eDim_nod2D
             exchange(n)=tracers%data(1)%values(1, n)                     ! sea surface temperature [°C]
@@ -267,7 +267,7 @@ subroutine update_atm_forcing(istep, ice, tracers, dynamics, partit, mesh)
 !---wiso-code-end
             else	    
             print *, 'not installed yet or error in cpl_oasis3mct_send', mype
-#endif  ! oifs
+#endif
          endif
          call cpl_oasis3mct_send(i, exchange, action, partit)
       end do
@@ -384,7 +384,7 @@ subroutine update_atm_forcing(istep, ice, tracers, dynamics, partit, mesh)
              if (action) then
                 v_wind(:)                     = exchange(:)        ! meridional wind
              end if
-#else ! oifs
+#else
          elseif (i.eq.13) then
             if (action) then
                  if (lwiso) then         
@@ -474,7 +474,7 @@ subroutine update_atm_forcing(istep, ice, tracers, dynamics, partit, mesh)
              if (use_icebergs.and.lwiso) then    
                  call force_flux_consv(v_wind, mask, i, 0, action, partit, mesh)
              end if
-#endif !   oifs
+#endif
          end if
 
 #ifdef VERBOSE