diff --git a/src/ppm_mg_restrict.f b/src/ppm_mg_restrict.f
index df23f927ec5f22c6facb20bde4851bd4c5870267..e3a5362b3d35446111521700e7396b60e707c68e 100644
--- a/src/ppm_mg_restrict.f
+++ b/src/ppm_mg_restrict.f
@@ -282,8 +282,6 @@
               CALL ppm_map_field_push(topoid,mesh_id_g(mlevm1),uc_dummy,&
         &                         info)
               CALL ppm_map_field_send(info)
-              !TODO: I'm not 100% sure about that since the signature
-              !has been changed dramatically
               CALL ppm_map_field_pop(topoid,mesh_id_g(mlevm1),uc_dummy,&
         &                          ghostsize,info)
           DO isub=1,nsubs
@@ -361,8 +359,6 @@
               CALL ppm_map_field_push(topoid,mesh_id_g(mlevm1),uc_dummy,&
         &                         info)
               CALL ppm_map_field_send(info)
-              !TODO: I'm not 100% sure about that since the signature
-              !has been changed dramatically
               CALL ppm_map_field_pop(topoid,mesh_id_g(mlevm1),uc_dummy,&
         &                          ghostsize,info)
 
@@ -488,8 +484,6 @@
               CALL ppm_map_field_push(topoid,mesh_id_g(mlevm1),uc_dummy,&
         &                         vecdim,info)
               CALL ppm_map_field_send(info)
-              !TODO: I'm not 100% sure about that since the signature
-              !has been changed dramatically
               CALL ppm_map_field_pop(topoid,mesh_id_g(mlevm1),uc_dummy,&
         &                          vecdim,ghostsize,info)
           DO isub=1,nsubs
@@ -585,8 +579,6 @@
               CALL ppm_map_field_push(topoid,mesh_id_g(mlevm1),uc_dummy,&
         &                         vecdim,info)
               CALL ppm_map_field_send(info)
-              !TODO: I'm not 100% sure about that since the signature
-              !has been changed dramatically
               CALL ppm_map_field_pop(topoid,mesh_id_g(mlevm1),uc_dummy,&
         &                          vecdim,ghostsize,info)
          DO isub=1,nsubs
diff --git a/src/ppm_mg_smooth_coarse.f b/src/ppm_mg_smooth_coarse.f
index 8849623b72193a6ba4a96d8fc272f86e37089b3e..0afc9d968a4dc5ad99ad9d142b63dd749aaf12ee 100644
--- a/src/ppm_mg_smooth_coarse.f
+++ b/src/ppm_mg_smooth_coarse.f
@@ -395,8 +395,6 @@
               CALL ppm_map_field_push(topoid,mesh_id_g(mlev),uc_dummy,&
         &                         info)
               CALL ppm_map_field_send(info)
-              !TODO: I'm not 100% sure about that since the signature
-              !has been changed dramatically
               CALL ppm_map_field_pop(topoid,mesh_id_g(mlev),uc_dummy,&
         &                          ghostsize,info)
                DO isub=1,nsubs
@@ -430,8 +428,6 @@
               CALL ppm_map_field_push(topoid,mesh_id_g(mlev),uc_dummy,&
         &                         info)
               CALL ppm_map_field_send(info)
-              !TODO: I'm not 100% sure about that since the signature
-              !has been changed dramatically
               CALL ppm_map_field_pop(topoid,mesh_id_g(mlev),uc_dummy,&
         &                          ghostsize,info)
                DO isub=1,nsubs
@@ -495,8 +491,6 @@
               CALL ppm_map_field_push(topoid,mesh_id_g(mlev),uc_dummy,&
         &                         info)
               CALL ppm_map_field_send(info)
-              !TODO: I'm not 100% sure about that since the signature
-              !has been changed dramatically
               CALL ppm_map_field_pop(topoid,mesh_id_g(mlev),uc_dummy,&
         &                          ghostsize,info)
                  a=0
@@ -700,8 +694,6 @@
               CALL ppm_map_field_push(topoid,mesh_id_g(mlev),uc_dummy,&
         &                         vecdim,info)
               CALL ppm_map_field_send(info)
-              !TODO: I'm not 100% sure about that since the signature
-              !has been changed dramatically
               CALL ppm_map_field_pop(topoid,mesh_id_g(mlev),uc_dummy,&
         &                          vecdim,ghostsize,info)
                DO isub=1,nsubs
@@ -736,8 +728,6 @@
               CALL ppm_map_field_push(topoid,mesh_id_g(mlev),uc_dummy,&
         &                         vecdim,info)
               CALL ppm_map_field_send(info)
-              !TODO: I'm not 100% sure about that since the signature
-              !has been changed dramatically
               CALL ppm_map_field_pop(topoid,mesh_id_g(mlev),uc_dummy,&
         &                          vecdim,ghostsize,info)
                DO isub=1,nsubs
@@ -825,8 +815,6 @@
                CALL ppm_map_field_push(topoid,mesh_id_g(mlev),uc_dummy,&
         &                         vecdim,info)
                CALL ppm_map_field_send(info)
-               !TODO: I'm not 100% sure about that since the signature
-               !has been changed dramatically
                CALL ppm_map_field_pop(topoid,mesh_id_g(mlev),uc_dummy,&
         &                          vecdim,ghostsize,info)
                  a=0
@@ -1019,8 +1007,6 @@
               CALL ppm_map_field_push(topoid,mesh_id_g(mlev),uc_dummy,&
         &                         vecdim,info)
               CALL ppm_map_field_send(info)
-              !TODO: I'm not 100% sure about that since the signature
-              !has been changed dramatically
               CALL ppm_map_field_pop(topoid,mesh_id_g(mlev),uc_dummy,&
         &                          vecdim,ghostsize,info)
                    DO isub=1,nsubs 
diff --git a/src/ppm_mg_smooth_fine.f b/src/ppm_mg_smooth_fine.f
index 764eac5f42ef5afc1c6fb1271e62d32101eec8fd..e71a17d7628d7caf722a9992e396938e8154d853 100644
--- a/src/ppm_mg_smooth_fine.f
+++ b/src/ppm_mg_smooth_fine.f
@@ -377,8 +377,7 @@ dz=dz_d
         &                         ghostsize,info)
               CALL ppm_map_field_push(topoid,mesh_id_g(mlev),u,info)
               CALL ppm_map_field_send(info)
-              !TODO: I'm not 100% sure about that since the signature
-              !has been changed dramatically
+
               CALL ppm_map_field_pop(topoid,mesh_id_g(mlev),u,ghostsize,info)
 
         ENDIF
@@ -484,8 +483,6 @@ dz=dz_d
         &                         ghostsize,info)
               CALL ppm_map_field_push(topoid,mesh_id_g(mlev),u,info)
               CALL ppm_map_field_send(info)
-              !TODO: I'm not 100% sure about that since the signature
-              !has been changed dramatically
               CALL ppm_map_field_pop(topoid,mesh_id_g(mlev),u,ghostsize,info)
               DO isub=1,nsubs
               DO k=start(3,isub,1)+e(isub),istop(3,isub,1)-g(isub)
@@ -514,8 +511,6 @@ dz=dz_d
         &                         ghostsize,info)
               CALL ppm_map_field_push(topoid,mesh_id_g(mlev),u,info)
               CALL ppm_map_field_send(info)
-              !TODO: I'm not 100% sure about that since the signature
-              !has been changed dramatically
               CALL ppm_map_field_pop(topoid,mesh_id_g(mlev),u,ghostsize,info)
         ENDIF
       ENDDO
@@ -536,8 +531,6 @@ dz=dz_d
         &                         ghostsize,info)
               CALL ppm_map_field_push(topoid,mesh_id_g(mlev),u,vecdim,info)
               CALL ppm_map_field_send(info)
-              !TODO: I'm not 100% sure about that since the signature
-              !has been changed dramatically
               CALL ppm_map_field_pop(topoid,mesh_id_g(mlev),u,&
         &                          vecdim,ghostsize,info)
            DO isub=1,nsubs
@@ -558,8 +551,6 @@ dz=dz_d
         &                         ghostsize,info)
               CALL ppm_map_field_push(topoid,mesh_id_g(mlev),u,vecdim,info)
               CALL ppm_map_field_send(info)
-              !TODO: I'm not 100% sure about that since the signature
-              !has been changed dramatically
               CALL ppm_map_field_pop(topoid,mesh_id_g(mlev),u,&
         &                          vecdim,ghostsize,info)
          ENDIF
@@ -672,8 +663,6 @@ dz=dz_d
         &                         ghostsize,info)
               CALL ppm_map_field_push(topoid,mesh_id_g(mlev),u,vecdim,info)
               CALL ppm_map_field_send(info)
-              !TODO: I'm not 100% sure about that since the signature
-              !has been changed dramatically
               CALL ppm_map_field_pop(topoid,mesh_id_g(mlev),u,&
         &                          vecdim,ghostsize,info)
 #ifdef  __VECTOR
@@ -748,8 +737,6 @@ dz=dz_d
         &                         ghostsize,info)
               CALL ppm_map_field_push(topoid,mesh_id_g(mlev),u,vecdim,info)
               CALL ppm_map_field_send(info)
-              !TODO: I'm not 100% sure about that since the signature
-              !has been changed dramatically
               CALL ppm_map_field_pop(topoid,mesh_id_g(mlev),u,&
         &                          vecdim,ghostsize,info)
            ENDIF