diff --git a/ampel-firmware/csv_writer.cpp b/ampel-firmware/csv_writer.cpp
index 1ae943169ed986be03328f1cfaeaff50aa8dc43d..2a673a83b3fbd2eba28297dbd89ebb5629d80fed 100644
--- a/ampel-firmware/csv_writer.cpp
+++ b/ampel-firmware/csv_writer.cpp
@@ -118,7 +118,7 @@ namespace csv_writer {
     Serial.println();
 
     sensor_commands::defineIntCallback("csv", setCSVinterval, " 60 (Sets CSV writing interval, in s)");
-    // sensor_commands::defineCallback("format_filesystem", FS_LIB.format);
+    sensor_commands::defineCallback("format_filesystem", formatFilesystem, "(Deletes the whole filesystem.)");
   }
 
   File openOrCreate() {
@@ -175,4 +175,9 @@ namespace csv_writer {
     Serial.println("s.");
     led_effects::showKITTWheel(color::green, 1);
   }
+
+  void formatFilesystem() {
+    FS_LIB.format();
+    led_effects::showKITTWheel(color::blue, 2);
+  }
 }
diff --git a/ampel-firmware/csv_writer.h b/ampel-firmware/csv_writer.h
index aa39f0e12fa44a934c97fd662f9c177758b85552..0b15970c517ce084b57718178fcb0ff333625e2e 100644
--- a/ampel-firmware/csv_writer.h
+++ b/ampel-firmware/csv_writer.h
@@ -27,6 +27,7 @@ namespace csv_writer {
   extern const String filename;
 
   void setCSVinterval(int32_t csv_interval);
+  void formatFilesystem();
 }
 
 #endif
diff --git a/ampel-firmware/mqtt.cpp b/ampel-firmware/mqtt.cpp
index f723ddf193f644219f4e1659ceefebd9ed93224c..053b777f7d6ea0940fc436e5e254f47ba2507a5b 100644
--- a/ampel-firmware/mqtt.cpp
+++ b/ampel-firmware/mqtt.cpp
@@ -99,12 +99,7 @@ namespace mqtt {
 
     if (messageString == "publish") {
       Serial.println(F("Forcing MQTT publish now."));
-      publish(sensor::timestamp, sensor::co2, sensor::temperature, sensor::humidity);
-#ifdef AMPEL_CSV
-    } else if (messageString == "format_filesystem") {
-      FS_LIB.format();
-      led_effects::showKITTWheel(color::blue, 2);
-#endif
+      last_sent_at = 0;
     } else if (messageString == "night_mode") {
       led_effects::toggleNightMode();
     } else if (messageString == "local_ip") {
diff --git a/ampel-firmware/mqtt.h b/ampel-firmware/mqtt.h
index 4fbdd1dd9df5e2954d1066230d8ac3dcdd2cc048..26b5805d2c2e88b099f33d86f7da9c72169a64e7 100644
--- a/ampel-firmware/mqtt.h
+++ b/ampel-firmware/mqtt.h
@@ -5,10 +5,6 @@
 #include "config.h"
 #include "led_effects.h"
 #include "sensor_commands.h"
-#ifdef AMPEL_CSV
-#  include "csv_writer.h"
-#endif
-#include "co2_sensor.h"
 #include "src/lib/PubSubClient/src/PubSubClient.h"
 #include "wifi_util.h"
 namespace config {
diff --git a/ampel-firmware/sensor_commands.cpp b/ampel-firmware/sensor_commands.cpp
index 0415a2a4d25b5f3c2869be8a525c594b635eb4f4..c6bd77cb7e37533f7fe3299ddf2fae7640306707 100644
--- a/ampel-firmware/sensor_commands.cpp
+++ b/ampel-firmware/sensor_commands.cpp
@@ -16,6 +16,10 @@ namespace sensor_commands {
 
   Callback callbacks[MAX_CALLBACKS];
 
+  void defineCallback(const char *name, void (*function)(void), const char *doc) {
+
+  }
+
   void defineIntCallback(const char *name, void (*function)(int32_t), const char *doc) {
     if (callbacks_count < MAX_CALLBACKS) {
       callbacks[callbacks_count] = Callback(name, function, doc);
diff --git a/ampel-firmware/sensor_commands.h b/ampel-firmware/sensor_commands.h
index 525e6714daa6c7032d2211d2570a973249f7220d..63c1e449f03856e86613f659ada30b41f3362c5d 100644
--- a/ampel-firmware/sensor_commands.h
+++ b/ampel-firmware/sensor_commands.h
@@ -8,6 +8,6 @@
 
 namespace sensor_commands {
   void run(const char *command);
-  //TODO: Add defineIntCallback?
   void defineIntCallback(const char *command, void (*function)(int32_t), const char *doc);
+  void defineCallback(const char *command, void (*function)(void), const char *doc);
 }