diff --git a/conf/modules/flight_time.xml b/conf/modules/flight_time.xml
index 46ab86b367..fd61468945 100644
--- a/conf/modules/flight_time.xml
+++ b/conf/modules/flight_time.xml
@@ -3,16 +3,23 @@
 <module name="flight_time" dir="time">
   <doc>
     <description>
-      Flight time calculator
+      Flight time calculator.
       Allows to check how much time is left before the end of the competition.
     </description>
   </doc>
+  <settings>
+    <dl_settings>
+      <dl_settings name="flight time">
+        <dl_setting var="time_until_land" module="modules/time/flight_time" min="0" step="1" max="1800" param="FLIGHT_TIME_LEFT"/>
+      </dl_settings>
+    </dl_settings>
+  </settings>
   <header>
     <file name="flight_time.h"/>
   </header>
   <init fun="flight_time_init()"/>
-  <periodic fun="flight_time_periodic()" freq="1"/> <!--(0.1171875) 1Hz only valid in case: the modules run a 512Hz but the module generator thinks it runs at 60Hz therefore the scaling factor should be 60/512-->
+  <periodic fun="flight_time_periodic()" freq="1"/>
   <makefile>
     <file name="flight_time.c"/>
   </makefile>
-</module>
\ No newline at end of file
+</module>
diff --git a/conf/settings/modules/flight_time.xml b/conf/settings/modules/flight_time.xml
deleted file mode 100644
index 312ec12ecc..0000000000
--- a/conf/settings/modules/flight_time.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE settings SYSTEM "../settings.dtd">
-
-<settings>
-  <dl_settings>
-    <dl_settings name="IMAV 2013">
-      <dl_setting var="time_until_land" module="modules/time/flight_time" min="0" step="1" max="1800" param="FLIGHT_TIME_LEFT"/>
-    </dl_settings>
-  </dl_settings>
-</settings>