diff --git a/client/controller.cpp b/client/controller.cpp
index 6fda5a73..1f0669e3 100644
--- a/client/controller.cpp
+++ b/client/controller.cpp
@@ -31,7 +31,6 @@
 #include "message/serverSettings.h"
 #include "message/time.h"
 #include "message/request.h"
-#include "message/ack.h"
 #include "message/hello.h"
 
 using namespace std;
diff --git a/message/ack.h b/message/ack.h
deleted file mode 100644
index e2563928..00000000
--- a/message/ack.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/***
-    This file is part of snapcast
-    Copyright (C) 2014-2016  Johannes Pohl
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#ifndef ACK_MSG_H
-#define ACK_MSG_H
-
-#include "message.h"
-
-namespace msg
-{
-
-class Ack : public BaseMessage
-{
-public:
-	Ack() : BaseMessage(message_type::kAck), message("")
-	{
-	}
-
-	Ack(const std::string& _message) : BaseMessage(message_type::kAck), message(_message)
-	{
-	}
-
-	virtual ~Ack()
-	{
-	}
-
-	virtual void read(std::istream& stream)
-	{
-		int16_t size;
-		stream.read(reinterpret_cast<char *>(&size), sizeof(int16_t));
-		message.resize(size);
-		stream.read(&message[0], size);
-	}
-
-	virtual uint32_t getSize() const
-	{
-		return sizeof(int16_t) + message.size();
-	}
-
-	std::string message;
-
-protected:
-	virtual void doserialize(std::ostream& stream) const
-	{
-		int16_t size(message.size());
-		stream.write(reinterpret_cast<const char *>(&size), sizeof(int16_t));
-		stream.write(message.c_str(), size);
-	}
-};
-
-}
-
-
-
-#endif
-
-
diff --git a/message/message.h b/message/message.h
index 7216f8dd..5bd12649 100644
--- a/message/message.h
+++ b/message/message.h
@@ -55,11 +55,11 @@ enum message_type
 	kServerSettings = 4,
 	kTime = 5,
 	kRequest = 6,
-	kAck = 7,
+//	kAck = 7,
 //	kCommand = 8,
 	kHello = 9,
-	kMap = 10,
-	kString = 11
+	kMap = 10
+//	kString = 11
 };
 
 
diff --git a/message/stringMessage.h b/message/stringMessage.h
deleted file mode 100644
index ad3206a6..00000000
--- a/message/stringMessage.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/***
-    This file is part of snapcast
-    Copyright (C) 2014-2016  Johannes Pohl
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#ifndef STRING_MESSAGE_H
-#define STRING_MESSAGE_H
-
-#include "message.h"
-#include <string>
-
-
-namespace msg
-{
-
-class StringMessage : public BaseMessage
-{
-public:
-	StringMessage(message_type msgType) : BaseMessage(msgType), str("")
-	{
-	}
-
-	StringMessage(message_type msgType, const std::string& _str) : BaseMessage(msgType), str(_str)
-	{
-	}
-
-	virtual ~StringMessage()
-	{
-	}
-
-	virtual void read(std::istream& stream)
-	{
-		int16_t size;
-		stream.read(reinterpret_cast<char *>(&size), sizeof(int16_t));
-		str.resize(size);
-		stream.read(&str[0], size);
-	}
-
-	virtual uint32_t getSize() const
-	{
-		return sizeof(int16_t) + str.size();
-	}
-
-	std::string str;
-
-protected:
-	virtual void doserialize(std::ostream& stream) const
-	{
-		int16_t size(str.size());
-		stream.write(reinterpret_cast<const char *>(&size), sizeof(int16_t));
-		stream.write(str.c_str(), size);
-	}
-};
-
-}
-
-
-#endif
-
-