diff --git a/src/fortran_support.F90 b/src/fortran_support.F90
index b31ad795caf4aa029b1dfe37c8e943cd169bff86..a17d8546f626759817f879d3f795292b21e525a0 100644
--- a/src/fortran_support.F90
+++ b/src/fortran_support.F90
@@ -32,22 +32,20 @@ MODULE fortran_support
     & t_ptr_1d_wp => t_ptr_1d_sp, &
     & t_ptr_2d_wp => t_ptr_2d_sp, &
     & t_ptr_3d_wp => t_ptr_3d_sp, &
-    & t_ptr_4d_wp => t_ptr_4d_sp
-  USE mo_fortran_tools, ONLY: & ! TODO: Replace t_ptr_Xd with suffix version in ICON, then remove
-    & t_ptr_1d => t_ptr_1d_sp, &
-    & t_ptr_2d => t_ptr_2d_sp, &
-    & t_ptr_3d => t_ptr_3d_sp, &
-    & t_ptr_4d => t_ptr_4d_sp
+    & t_ptr_4d_wp => t_ptr_4d_sp, &
+    & t_ptr_1d    => t_ptr_1d_sp, &
+    & t_ptr_2d    => t_ptr_2d_sp, &
+    & t_ptr_3d    => t_ptr_3d_sp, &
+    & t_ptr_4d    => t_ptr_4d_sp
 #else
     & t_ptr_1d_wp => t_ptr_1d_dp, &
     & t_ptr_2d_wp => t_ptr_2d_dp, &
     & t_ptr_3d_wp => t_ptr_3d_dp, &
-    & t_ptr_4d_wp => t_ptr_4d_dp
-  USE mo_fortran_tools, ONLY: & ! TODO: Replace t_ptr_Xd with suffix version in ICON, then remove
-    & t_ptr_1d => t_ptr_1d_dp, &
-    & t_ptr_2d => t_ptr_2d_dp, &
-    & t_ptr_3d => t_ptr_3d_dp, &
-    & t_ptr_4d => t_ptr_4d_dp
+    & t_ptr_4d_wp => t_ptr_4d_dp, &
+    & t_ptr_1d    => t_ptr_1d_dp, &
+    & t_ptr_2d    => t_ptr_2d_dp, &
+    & t_ptr_3d    => t_ptr_3d_dp, &
+    & t_ptr_4d    => t_ptr_4d_dp
 #endif
 
   USE mo_hash_table, ONLY: t_HashTable, hashTable_make, t_HashIterator
@@ -118,7 +116,7 @@ MODULE fortran_support
     & init_contiguous_l, minval_1d, minval_2d, resize_arr_c1d, DO_DEALLOCATE, &
     & DO_PTR_DEALLOCATE, insert_dimension, assert_acc_host_only, &
     & assert_acc_device_only, set_acc_host_or_device
-  PUBLIC :: t_ptr_1d, t_ptr_2d, t_ptr_3d, t_ptr_4d ! TODO: Remove
+  PUBLIC :: t_ptr_1d, t_ptr_2d, t_ptr_3d, t_ptr_4d
 
   ! From mo_hash_table
   PUBLIC :: t_HashTable, hashTable_make, t_HashIterator