diff --git a/doc/tex/c_quick_ref.tex b/doc/tex/c_quick_ref.tex
index daf8205cd8d41bfb2bf87273c7446844b25b6d00..78cd8695119d4192cb628e6fce70be2c056b4563 100644
--- a/doc/tex/c_quick_ref.tex
+++ b/doc/tex/c_quick_ref.tex
@@ -849,24 +849,6 @@ Create a Time axis.
 Define the calendar.
 
 
-\section*{\tt \htmlref{taxisDefFdate}{taxisDefFdate}}
-
-\begin{verbatim}
-    void taxisDefFdate (int taxisID, int date);
-\end{verbatim}
-
-Define the forecast reference date.
-
-
-\section*{\tt \htmlref{taxisDefFtime}{taxisDefFtime}}
-
-\begin{verbatim}
-    void taxisDefFtime (int taxisID, int time);
-\end{verbatim}
-
-Define the forecast reference time.
-
-
 \section*{\tt \htmlref{taxisDefRdate}{taxisDefRdate}}
 
 \begin{verbatim}
@@ -921,24 +903,6 @@ Destroy a Time axis.
 Get the calendar.
 
 
-\section*{\tt \htmlref{taxisInqFdate}{taxisInqFdate}}
-
-\begin{verbatim}
-    int taxisInqFdate (int taxisID);
-\end{verbatim}
-
-Get the forecast reference date.
-
-
-\section*{\tt \htmlref{taxisInqFtime}{taxisInqFtime}}
-
-\begin{verbatim}
-    int taxisInqFtime (int taxisID);
-\end{verbatim}
-
-Get the forecast reference time.
-
-
 \section*{\tt \htmlref{taxisInqRdate}{taxisInqRdate}}
 
 \begin{verbatim}
diff --git a/doc/tex/f_quick_ref.tex b/doc/tex/f_quick_ref.tex
index e72627a4db4e4b3701c48314b17ad8e3ea86bf09..db432bce02727c4f02dfe5d38293f78f0dc04ab7 100644
--- a/doc/tex/f_quick_ref.tex
+++ b/doc/tex/f_quick_ref.tex
@@ -859,24 +859,6 @@ Create a Time axis.
 Define the calendar.
 
 
-\section*{\tt \htmlref{taxisDefFdate}{taxisDefFdate}}
-
-\begin{verbatim}
-    SUBROUTINE taxisDefFdate (INTEGER taxisID, INTEGER date)
-\end{verbatim}
-
-Define the forecast reference date.
-
-
-\section*{\tt \htmlref{taxisDefFtime}{taxisDefFtime}}
-
-\begin{verbatim}
-    SUBROUTINE taxisDefFtime (INTEGER taxisID, INTEGER time)
-\end{verbatim}
-
-Define the forecast reference time.
-
-
 \section*{\tt \htmlref{taxisDefRdate}{taxisDefRdate}}
 
 \begin{verbatim}
@@ -931,24 +913,6 @@ Destroy a Time axis.
 Get the calendar.
 
 
-\section*{\tt \htmlref{taxisInqFdate}{taxisInqFdate}}
-
-\begin{verbatim}
-    INTEGER FUNCTION taxisInqFdate (INTEGER taxisID)
-\end{verbatim}
-
-Get the forecast reference date.
-
-
-\section*{\tt \htmlref{taxisInqFtime}{taxisInqFtime}}
-
-\begin{verbatim}
-    INTEGER FUNCTION taxisInqFtime (INTEGER taxisID)
-\end{verbatim}
-
-Get the forecast reference time.
-
-
 \section*{\tt \htmlref{taxisInqRdate}{taxisInqRdate}}
 
 \begin{verbatim}
diff --git a/src/cdi.inc b/src/cdi.inc
index 6bcfce6dd1231657076950cbfb1ebc7e84ef6ae6..205268dc7890bf80cbb3a3c162ccb3610879e179 100644
--- a/src/cdi.inc
+++ b/src/cdi.inc
@@ -4,7 +4,7 @@
 !
 ! Author:
 ! -------
-! Uwe Schulzweida, MPI-MET, Hamburg,   October 2022
+! Uwe Schulzweida, MPI-MET, Hamburg,   November 2022
 !
 
 !
@@ -62,6 +62,8 @@
       PARAMETER (CDI_EUNC4              = -26)
       INTEGER    CDI_EDIMSIZE
       PARAMETER (CDI_EDIMSIZE           = -27)
+      INTEGER    CDI_EQENF
+      PARAMETER (CDI_EQENF              = -50)
       INTEGER    CDI_ELIMIT
       PARAMETER (CDI_ELIMIT             = -99)
 !
@@ -2304,24 +2306,6 @@
 !                                    (INTEGER         taxisID)
       EXTERNAL        taxisInqRtime
 
-!                     taxisDefFdate
-!                                    (INTEGER         taxisID,
-!                                     INTEGER         date)
-      EXTERNAL        taxisDefFdate
-
-!                     taxisDefFtime
-!                                    (INTEGER         taxisID,
-!                                     INTEGER         time)
-      EXTERNAL        taxisDefFtime
-
-      INTEGER         taxisInqFdate
-!                                    (INTEGER         taxisID)
-      EXTERNAL        taxisInqFdate
-
-      INTEGER         taxisInqFtime
-!                                    (INTEGER         taxisID)
-      EXTERNAL        taxisInqFtime
-
       INTEGER         taxisHasBounds
 !                                    (INTEGER         taxisID)
       EXTERNAL        taxisHasBounds
diff --git a/src/cdiFortran.c b/src/cdiFortran.c
index cac999910f6ce46e5d07018547b9c7a55322cde7..d94e73d34a45e96567c2ee898e195514653a2857 100644
--- a/src/cdiFortran.c
+++ b/src/cdiFortran.c
@@ -708,10 +708,6 @@ FCALLSCSUB2 (taxisDefRdate, TAXISDEFRDATE, taxisdefrdate, INT, INT)
 FCALLSCSUB2 (taxisDefRtime, TAXISDEFRTIME, taxisdefrtime, INT, INT)
 FCALLSCFUN1 (INT, taxisInqRdate, TAXISINQRDATE, taxisinqrdate, INT)
 FCALLSCFUN1 (INT, taxisInqRtime, TAXISINQRTIME, taxisinqrtime, INT)
-FCALLSCSUB2 (taxisDefFdate, TAXISDEFFDATE, taxisdeffdate, INT, INT)
-FCALLSCSUB2 (taxisDefFtime, TAXISDEFFTIME, taxisdefftime, INT, INT)
-FCALLSCFUN1 (INT, taxisInqFdate, TAXISINQFDATE, taxisinqfdate, INT)
-FCALLSCFUN1 (INT, taxisInqFtime, TAXISINQFTIME, taxisinqftime, INT)
 FCALLSCFUN1 (INT, taxisHasBounds, TAXISHASBOUNDS, taxishasbounds, INT)
 FCALLSCSUB1 (taxisWithBounds, TAXISWITHBOUNDS, taxiswithbounds, INT)
 FCALLSCSUB1 (taxisDeleteBounds, TAXISDELETEBOUNDS, taxisdeletebounds, INT)
diff --git a/src/mo_cdi.f90 b/src/mo_cdi.f90
index 5886bc7832707166f229fb27f34c11d0f55317c2..f2cb06e3eaa978a2b19e49378bbbaed7d7db9eae 100644
--- a/src/mo_cdi.f90
+++ b/src/mo_cdi.f90
@@ -45,6 +45,7 @@ module mo_cdi
   integer(c_int), public, parameter :: CDI_EUFSTRUCT = -25
   integer(c_int), public, parameter :: CDI_EUNC4 = -26
   integer(c_int), public, parameter :: CDI_EDIMSIZE = -27
+  integer(c_int), public, parameter :: CDI_EQENF = -50
   integer(c_int), public, parameter :: CDI_ELIMIT = -99
   integer(c_int), public, parameter :: CDI_FILETYPE_GRB = 1
   integer(c_int), public, parameter :: CDI_FILETYPE_GRB2 = 2
@@ -645,10 +646,6 @@ module mo_cdi
   public :: taxisDefRtime
   public :: taxisInqRdate
   public :: taxisInqRtime
-  public :: taxisDefFdate
-  public :: taxisDefFtime
-  public :: taxisInqFdate
-  public :: taxisInqFtime
   public :: taxisHasBounds
   public :: taxisWithBounds
   public :: taxisDeleteBounds
@@ -2636,34 +2633,6 @@ module mo_cdi
       integer(c_int) :: f_result
     end function taxisInqRtime
 
-    subroutine taxisDefFdate(taxisID_dummy, date_dummy) bind(c, name =&
-    & 'taxisDefFdate')
-      import c_int
-      integer(c_int), value :: taxisID_dummy
-      integer(c_int), value :: date_dummy
-    end subroutine taxisDefFdate
-
-    subroutine taxisDefFtime(taxisID_dummy, time_dummy) bind(c, name =&
-    & 'taxisDefFtime')
-      import c_int
-      integer(c_int), value :: taxisID_dummy
-      integer(c_int), value :: time_dummy
-    end subroutine taxisDefFtime
-
-    function taxisInqFdate(taxisID_dummy) bind(c, name = 'taxisInqFdate')&
-    & result(f_result)
-      import c_int
-      integer(c_int), value :: taxisID_dummy
-      integer(c_int) :: f_result
-    end function taxisInqFdate
-
-    function taxisInqFtime(taxisID_dummy) bind(c, name = 'taxisInqFtime')&
-    & result(f_result)
-      import c_int
-      integer(c_int), value :: taxisID_dummy
-      integer(c_int) :: f_result
-    end function taxisInqFtime
-
     function taxisHasBounds(taxisID_dummy) bind(c, name = 'taxisHasBounds')&
     & result(f_result)
       import c_int