diff --git a/CMakeLists.txt b/CMakeLists.txt
index 103da89..6397259 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,8 +61,8 @@ add_library(whisper-com STATIC
   src/WHISPER/Messages/Leave.cpp
  
 
-  include/WHISPER/Messages/Track.hpp
-  src/WHISPER/Messages/Track.cpp
+  # include/WHISPER/Messages/Track.hpp
+  # src/WHISPER/Messages/Track.cpp
   
 
 
@@ -72,7 +72,7 @@ add_library(whisper-com STATIC
   include/WHISPER/Messages/Protos/join.pb.cc    
 
   include/WHISPER/Messages/Protos/leave.pb.cc  
-  include/WHISPER/Messages/Protos/raw_track.pb.cc  
+  # include/WHISPER/Messages/Protos/raw_track.pb.cc  
 
 
 )
diff --git a/src/WHISPER/Messages/Message.cpp b/src/WHISPER/Messages/Message.cpp
index e1e2c18..68b7552 100644
--- a/src/WHISPER/Messages/Message.cpp
+++ b/src/WHISPER/Messages/Message.cpp
@@ -54,6 +54,7 @@ namespace WHISPER {
      void Message::addPayLoad(std::shared_ptr<google::protobuf::Any> payload){
         payload_ = payload;
         
+        msg.clear_payload();
         msg.add_payload()->CopyFrom(*payload_);
 
     }