diff --git a/srcF/sfx_esm.f90 b/srcF/sfx_esm.f90
index 266f8511227876914fe94c29a679d64ac42ec839..52c59f1a3a17edd21ec5f2787af031277049f2b3 100644
--- a/srcF/sfx_esm.f90
+++ b/srcF/sfx_esm.f90
@@ -241,7 +241,6 @@ contains
         surface_type=meteo%surface_type
        
         
-        write (*,*) surface_type, 'esm'
         call get_dynamic_roughness_definition(surface_type, ocean_z0m_id, land_z0m_id, lake_z0m_id, snow_z0m_id, &
         forest_z0m_id, usersf_z0m_id, ice_z0m_id, z0m_id)
         
@@ -254,8 +253,6 @@ contains
         
         Re = u_dyn0 * z0_m / nu_air
         
-        !write (*,*)  surface_type, z0_m, z0m_id, z0t_id, z0_t, 'hi3'
-        !write (*,*)  u_dyn0, 'u_dyn0'
         call get_thermal_roughness_all(z0_t, B, z0_m, Re, u_dyn0, lai, z0t_id)
        
        ! --- define relative height
diff --git a/srcF/sfx_sheba_noniterative.f90 b/srcF/sfx_sheba_noniterative.f90
index 503d1ea61599f9e6ca601c8df4c158116f607674..aee16a766dc81617baa0eab1ea0b70129d4f00c8 100644
--- a/srcF/sfx_sheba_noniterative.f90
+++ b/srcF/sfx_sheba_noniterative.f90
@@ -154,7 +154,6 @@ contains
             h = meteo%h(i), &
             U = meteo%U(i), dT = meteo%dT(i), Tsemi = meteo%Tsemi(i), dQ = meteo%dQ(i), &
             z0_m = meteo%z0_m(i), depth=meteo%depth(i), lai=meteo%lai(i), surface_type=meteo%surface_type(i))
-            !write(*,*) 'get_flux', meteo%surface_type(i)
             call get_surface_fluxes(sfx_cell, meteo_cell, numerics)
 
             call push_sfx_data(sfx, sfx_cell, i)
@@ -262,7 +261,6 @@ contains
         surface_type=meteo%surface_type
        
         
-        !write (*,*) surface_type, 'esm'
         call get_dynamic_roughness_definition(surface_type, ocean_z0m_id, land_z0m_id, lake_z0m_id, snow_z0m_id, &
         forest_z0m_id, usersf_z0m_id, ice_z0m_id, z0m_id)
         
@@ -294,7 +292,6 @@ contains
          if (Rib > 0.0) then
             
             call get_zeta(zeta, Rib, h, z0_m, z0_t)
-            !write(*,*) 'get_zeta', zeta, h
             
             call get_psi_stable(psi_m, psi_h, zeta, zeta)
             call get_psi_stable(psi0_m, psi0_h, zeta * z0_m / h, zeta * z0_t / h)
@@ -304,11 +301,9 @@ contains
             S_mean=0.0
             Udyn = kappa * U / (log(h / z0_m) - (psi_m - psi0_m))
             Tdyn = kappa * dT * Pr_t_0_inv / (log(h / z0_t) - (psi_h - psi0_h))
-            !write(*,*) 'sfx_before_snow', Udyn, zeta, S_mean
 
             if (surface_type==3.or.surface_type==6.) then
                 if (Udyn>u_thsnow) then
-            !write(*,*) 'sfx_snow1', Udyn, zeta, surface_type
             call get_sigma(sigma_r, sigma_w, rho_air, rho_s)
             call get_w_snow(w_snow, sigma_w, g, d_s, nu_air)
             call get_h_salt(h_salt, Udyn)
@@ -330,7 +325,6 @@ contains
             Udyn = kappa * U / (log(h / z0_m) - (psi_m - psi0_m))
             Tdyn = kappa * dT * Pr_t_0_inv / (log(h / z0_t) - (psi_h - psi0_h))
 
-            !write(*,*) 'sfx_snow2', Udyn, zeta, S_mean, Linv
             endif 
             endif
         
@@ -390,7 +384,6 @@ contains
             Re = Re, B = B, z0_m = z0_m, z0_t = z0_t, &
             Rib_conv_lim = Rib_conv_lim, &
             Cm = Cm, Ct = Ct, Km = Km, Pr_t_inv = Pr_t_inv)
-        !write(*,*) 'Smean_0ut', S_mean
         !sfx = sfxDataType(zeta = zeta, Rib = Rib, &
         !    Re = Linv, B = B, z0_m = z0_m, z0_t = z0_t, &
         !    Rib_conv_lim = S_mean, &
@@ -425,7 +418,6 @@ contains
         real, intent(in) ::  S_salt, h_salt, z, w_snow, u_dyn0         
         ! ----------------------------------------------------------------------------
         S_mean  = S_salt *  (z/h_salt)**(-w_snow/(kappa*u_dyn0))
-        !write(*,*) 'Smean_func', S_mean, u_dyn0
     end subroutine
 
     subroutine get_S_salt(S_salt, u_dyn0, u_thsnow, g, h_salt)
@@ -438,7 +430,6 @@ contains
         if (u_dyn0>u_thsnow) then
             qs  = (u_dyn0*u_dyn0-u_thsnow*u_thsnow)/(Csn*u_dyn0*g*h_salt)
             S_salt=qs/(qs+rho_s/rho_air)
-            !write(*,*) 'S_salt', S_salt
         else
             S_salt=0.0
         endif