diff --git a/sf-buffer/include/BufferBinaryWriter.hpp b/sf-buffer-writer/include/BufferBinaryWriter.hpp
similarity index 100%
rename from sf-buffer/include/BufferBinaryWriter.hpp
rename to sf-buffer-writer/include/BufferBinaryWriter.hpp
diff --git a/sf-buffer/src/BufferBinaryWriter.cpp b/sf-buffer-writer/src/BufferBinaryWriter.cpp
similarity index 100%
rename from sf-buffer/src/BufferBinaryWriter.cpp
rename to sf-buffer-writer/src/BufferBinaryWriter.cpp
diff --git a/sf-buffer-writer/src/main.cpp b/sf-buffer-writer/src/main.cpp
index 0e39832..8b14409 100644
--- a/sf-buffer-writer/src/main.cpp
+++ b/sf-buffer-writer/src/main.cpp
@@ -9,7 +9,6 @@
 #include "formats.hpp"
 #include "buffer_config.hpp"
 #include "jungfrau.hpp"
-#include "FrameUdpReceiver.hpp"
 #include "BufferBinaryWriter.hpp"
 
 using namespace std;
diff --git a/sf-buffer/src/main.cpp b/sf-buffer/src/main.cpp
index 0e39832..ed49728 100644
--- a/sf-buffer/src/main.cpp
+++ b/sf-buffer/src/main.cpp
@@ -10,7 +10,6 @@
 #include "buffer_config.hpp"
 #include "jungfrau.hpp"
 #include "FrameUdpReceiver.hpp"
-#include "BufferBinaryWriter.hpp"
 
 using namespace std;
 using namespace chrono;
@@ -72,7 +71,6 @@ int main (int argc, char *argv[]) {
     uint64_t n_missed_packets = 0;
     uint64_t n_corrupted_frames = 0;
 
-    BufferBinaryWriter writer(root_folder, device_name);
     FrameUdpReceiver receiver(udp_port, source_id);
     RamBuffer buffer(detector_name, n_modules);
 
@@ -84,8 +82,6 @@ int main (int argc, char *argv[]) {
         auto pulse_id = receiver.get_frame_from_udp(
                 binary_buffer->metadata, binary_buffer->data);
 
-        writer.write(pulse_id, binary_buffer);
-
         buffer.write_frame(&(binary_buffer->metadata),
                            &(binary_buffer->data[0]));