diff --git a/owlps-positioner/src/input.cc b/owlps-positioner/src/input.cc
index dc0e486..d6c7fd1 100644
--- a/owlps-positioner/src/input.cc
+++ b/owlps-positioner/src/input.cc
@@ -124,11 +124,19 @@ const Request& Input::get_next_request() const
       const Request& request = medium->get_next_request() ;
       log_current_request() ;
 
+      /* Update the current time */
       if (Configuration::is_configured("replay"))
         Timestamp::update_current_time(request.get_time_sent()) ;
 
-      // If the request is a calibration request, add it to the Stock
-      // (if allowed, and if it is not empty)
+      /* Clean the old requests */
+      unsigned int cr_timeout =
+        Configuration::uint_value(
+          "positioning.calibration-requests-timeout") ;
+      if (cr_timeout > 0)
+        Stock::delete_calibration_requests_older_than(cr_timeout) ;
+
+      /* If the request is a calibration request, add it to the Stock
+       * (if allowed, and if it is not empty) */
       if (Configuration::bool_value(
             "positioning.accept-new-calibration-requests")
           && request)
diff --git a/owlps-positioner/src/positioning.cc b/owlps-positioner/src/positioning.cc
index 2f6d6e9..be9e137 100644
--- a/owlps-positioner/src/positioning.cc
+++ b/owlps-positioner/src/positioning.cc
@@ -136,12 +136,6 @@ void Positioning::loop()
       if (! request)
         continue ;
 
-      unsigned int cr_timeout =
-        Configuration::uint_value(
-          "positioning.calibration-requests-timeout") ;
-      if (cr_timeout > 0)
-        Stock::delete_calibration_requests_older_than(cr_timeout) ;
-
       Point3D real_position ;
       bool compute_error = false ;
       ResultList results(&request) ;