diff --git a/src/FLEXPART.f90 b/src/FLEXPART.f90
index 7a20ec48641002521d67936867e6de0692b45aa6..d1bdc211420b495c3fe24f05612ae058673187af 100644
--- a/src/FLEXPART.f90
+++ b/src/FLEXPART.f90
@@ -44,7 +44,7 @@ program flexpart
   real :: s_timemanager
   character(len=256) ::   &
     inline_options          ! pathfile, flexversion, arg2
-  character(len=256) :: gitversion_tmp="8d9c680 Mon Apr 22 15:37:39 2024 +0200"
+  character(len=256) :: gitversion_tmp="undefined"
 
   ! Keeping track of the total running time of FLEXPART, printed out at the end.
   !*****************************************************************************
diff --git a/src/gitversion.txt b/src/gitversion.txt
deleted file mode 100644
index bc95db4e52b5163b21e04c5eec1dbcd6379065e0..0000000000000000000000000000000000000000
--- a/src/gitversion.txt
+++ /dev/null
@@ -1 +0,0 @@
-8d9c680 Mon Apr 22 15:37:39 2024 +0200
diff --git a/src/readoptions_mod.f90 b/src/readoptions_mod.f90
index 85d1d3916639c5c49a12cec65134cd3e16c490b2..491789bf3743c8d78a61757cff915340085596f3 100644
--- a/src/readoptions_mod.f90
+++ b/src/readoptions_mod.f90
@@ -543,9 +543,9 @@ subroutine readcommand
   loutstep=10800
   loutaver=10800
   loutsample=900
-  lrecoutstep=3600
-  lrecoutaver=3600
-  lrecoutsample=900
+  lrecoutstep=-1
+  lrecoutaver=-1
+  lrecoutsample=-1
   loutrestart=-1
   lsynctime=900
   ctl=-5.0
@@ -585,6 +585,7 @@ subroutine readcommand
   WETBKDEP=.false.
   DRYBKDEP=.false.
 
+
   ! Open the command file and read user options
   ! Namelist input first: try to read as namelist file
   !**************************************************************************
@@ -834,6 +835,30 @@ subroutine readcommand
   endif
 #endif
 
+  ! Check whether RECEPTOR commands are given, otherwise give them default values
+  !******************************************************************************
+
+  if (lrecoutstep.eq.-1) then
+    write(*,*) 'WARNING: FILE COMMAND LRECOUTSTEP not provided,'
+    write(*,*) 'value of LOUTSTEP will be used if RECEPTORS are'
+    write(*,*) 'required.'
+    lrecoutstep=loutstep
+  endif
+
+  if (lrecoutaver.eq.-1) then
+    write(*,*) 'WARNING: FILE COMMAND LRECOUTAVER not provided,'
+    write(*,*) 'value of LOUTAVER will be used if RECEPTORS are'
+    write(*,*) 'required.'
+    lrecoutaver=loutaver
+  endif
+
+  if (lrecoutsample.eq.-1) then
+    write(*,*) 'WARNING: FILE COMMAND LRECOUTSTEP not provided,'
+    write(*,*) 'value of LOUTSAMPLE will be used if RECEPTORS are'
+    write(*,*) 'required.'
+    lrecoutsample=loutsample
+  endif
+
   ! Check whether a valid option for gridded model output has been chosen
   !**********************************************************************
 
diff --git a/tests/default_etex/EC1994102312.REMOVED.git-id b/tests/default_etex/EC1994102312.REMOVED.git-id
deleted file mode 100644
index 40b58307c5cc3b19825c3197fc515e8ac3693270..0000000000000000000000000000000000000000
--- a/tests/default_etex/EC1994102312.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-6da99ad066c33aa0caf7d353ee5ed24937d3c735
\ No newline at end of file
diff --git a/tests/default_etex/EC1994102318.REMOVED.git-id b/tests/default_etex/EC1994102318.REMOVED.git-id
deleted file mode 100644
index c25907be17e937395ef484354077f9ca2b97833e..0000000000000000000000000000000000000000
--- a/tests/default_etex/EC1994102318.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-90b7fca857f4493e8ce2982b2c3b4f5e4e0583cc
\ No newline at end of file
diff --git a/tests/default_etex/EC1994102400.REMOVED.git-id b/tests/default_etex/EC1994102400.REMOVED.git-id
deleted file mode 100644
index c15690e2719153cae7055904fd8cf49a72ba00df..0000000000000000000000000000000000000000
--- a/tests/default_etex/EC1994102400.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-4eef5a1c6750ba955afdc7dc64c781998723e513
\ No newline at end of file
diff --git a/tests/default_etex/EC1994102406.REMOVED.git-id b/tests/default_etex/EC1994102406.REMOVED.git-id
deleted file mode 100644
index 7e282621d0caf84dbbe9f5a854187f7af8d0e62f..0000000000000000000000000000000000000000
--- a/tests/default_etex/EC1994102406.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-c8cc09ebb0f32986a15b6b12681c2010ccc6f7fd
\ No newline at end of file
diff --git a/tests/default_etex/EC1994102412.REMOVED.git-id b/tests/default_etex/EC1994102412.REMOVED.git-id
deleted file mode 100644
index 9aac43d8470288621b19c3e5300bff767ade5e58..0000000000000000000000000000000000000000
--- a/tests/default_etex/EC1994102412.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-d268d2a3cc5e183690fdf1464f5146a31c18bccc
\ No newline at end of file
diff --git a/tests/default_etex/EC1994102418.REMOVED.git-id b/tests/default_etex/EC1994102418.REMOVED.git-id
deleted file mode 100644
index 51e843c15eb018c74d922702b11b01a8234c2c84..0000000000000000000000000000000000000000
--- a/tests/default_etex/EC1994102418.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-7b83fd7d7b92d1fad60bdd037eaf27daabc58abd
\ No newline at end of file
diff --git a/tests/default_etex/EC1994102500.REMOVED.git-id b/tests/default_etex/EC1994102500.REMOVED.git-id
deleted file mode 100644
index 55778f1270f87df76559fd1bcf2e3e134e3efcb7..0000000000000000000000000000000000000000
--- a/tests/default_etex/EC1994102500.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-37fbbda5bbe0027bbb10a4bb765659f74eb81174
\ No newline at end of file
diff --git a/tests/default_etex/EC1994102506.REMOVED.git-id b/tests/default_etex/EC1994102506.REMOVED.git-id
deleted file mode 100644
index c3237dcd6b20c85085ffd8787be35208c8e59318..0000000000000000000000000000000000000000
--- a/tests/default_etex/EC1994102506.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-790520b3c8b04e87e650a492a3f16d3a98b56a18
\ No newline at end of file
diff --git a/tests/default_etex/EC1994102512.REMOVED.git-id b/tests/default_etex/EC1994102512.REMOVED.git-id
deleted file mode 100644
index 0a759fab68acc9d06552c07446789bd4ccc2e220..0000000000000000000000000000000000000000
--- a/tests/default_etex/EC1994102512.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-691492d53210fbbe92a629a7345a4997c25b3142
\ No newline at end of file
diff --git a/tests/default_etex/EC1994102518.REMOVED.git-id b/tests/default_etex/EC1994102518.REMOVED.git-id
deleted file mode 100644
index bff2204b5e9540200482a864cc99a04a42b22a67..0000000000000000000000000000000000000000
--- a/tests/default_etex/EC1994102518.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-dc3c3d5cd682d7cbd664a5b99ae057195be3748a
\ No newline at end of file
diff --git a/tests/default_etex/EC1994102600.REMOVED.git-id b/tests/default_etex/EC1994102600.REMOVED.git-id
deleted file mode 100644
index 448b8a660bdecec0877eb8bb12d0e9c878405323..0000000000000000000000000000000000000000
--- a/tests/default_etex/EC1994102600.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-90db95dd0b841f9136b678ee0225f2fae60017d8
\ No newline at end of file
diff --git a/tests/default_etex/EC1994102606.REMOVED.git-id b/tests/default_etex/EC1994102606.REMOVED.git-id
deleted file mode 100644
index 62b2977ebe46e0aac20d96c9cf46ef07172ac7cb..0000000000000000000000000000000000000000
--- a/tests/default_etex/EC1994102606.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-693268aefa934c02c93e438999aabb3db45d5077
\ No newline at end of file
diff --git a/tests/default_etex/EC1994102612.REMOVED.git-id b/tests/default_etex/EC1994102612.REMOVED.git-id
deleted file mode 100644
index 3e937b4a05153e5669a909f8dd1fbba76bbc71dc..0000000000000000000000000000000000000000
--- a/tests/default_etex/EC1994102612.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-74aa06b4d66cb845cfcd1624320d7999eaeabe6a
\ No newline at end of file
diff --git a/tests/default_etex/EC1994102618.REMOVED.git-id b/tests/default_etex/EC1994102618.REMOVED.git-id
deleted file mode 100644
index 12a3275cf1c2e517232416af16e39a54626a94cd..0000000000000000000000000000000000000000
--- a/tests/default_etex/EC1994102618.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-1432774cb381a488eb4bab9bab32fecf4b6990a1
\ No newline at end of file
diff --git a/tests/default_etex/EC1994102700.REMOVED.git-id b/tests/default_etex/EC1994102700.REMOVED.git-id
deleted file mode 100644
index 7c9350d9ea58189f8c10bada7204ef4e7c59d619..0000000000000000000000000000000000000000
--- a/tests/default_etex/EC1994102700.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-4617e2548944564e5ce999e3cd426a710bf45c65
\ No newline at end of file
diff --git a/tests/default_etex/EC1994102706.REMOVED.git-id b/tests/default_etex/EC1994102706.REMOVED.git-id
deleted file mode 100644
index b430b4cf1492b3e2f06b6d4927fbbf33226c1944..0000000000000000000000000000000000000000
--- a/tests/default_etex/EC1994102706.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-217738d4c1d1220b46bb2c6f12c9719609276489
\ No newline at end of file
diff --git a/tests/default_etex/EC1994102712.REMOVED.git-id b/tests/default_etex/EC1994102712.REMOVED.git-id
deleted file mode 100644
index d0f8a77858d7e7eba3495894098f79042a3598b2..0000000000000000000000000000000000000000
--- a/tests/default_etex/EC1994102712.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-a6b4f28e5d33b1df9693526f01f5692990e69bb6
\ No newline at end of file