diff --git a/CMakeLists.txt b/CMakeLists.txt
index 55d9a4cfb..b64729c81 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -299,10 +299,8 @@ IF(EQEMU_BUILD_LUA)
 ENDIF(EQEMU_BUILD_LUA)
 
 IF(EQEMU_BUILD_SOCKET_SERVER)
-	FIND_PACKAGE(Boost COMPONENTS system filesystem thread REQUIRED)
 	INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/dependencies/websocketpp")
 	ADD_DEFINITIONS(-D_WEBSOCKETPP_CPP11_STL_)
-	
 ENDIF(EQEMU_BUILD_SOCKET_SERVER) 
 
 INCLUDE_DIRECTORIES("${ZLIB_INCLUDE_DIRS}" "${MySQL_INCLUDE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/common/glm/glm")
diff --git a/socket_server/socket_server.cpp b/socket_server/socket_server.cpp
index 997d9965f..3cf5046b7 100644
--- a/socket_server/socket_server.cpp
+++ b/socket_server/socket_server.cpp
@@ -64,7 +64,7 @@ void CatchSignal(int sig_num) {
 		worldserver->Disconnect();
 }
 
-/* Web Sockets Start Shit */
+/* Web Sockets Start */
 
 enum action_type {
 	SUBSCRIBE,
@@ -135,7 +135,7 @@ public:
 	void on_message(connection_hdl hdl, server::message_ptr msg) {
 		// queue message up for sending by processing thread
 		unique_lock<mutex> lock(m_action_lock);
-		msg->set_payload("Niggers");
+		msg->set_payload("Test Message");
 		// std::cout << "on_message" << std::endl;
 		m_actions.push(action(MESSAGE, hdl, msg));
 		lock.unlock();
@@ -188,7 +188,7 @@ private:
 	condition_variable m_action_cond;
 };
 
-/* Web Sockets Shit End*/
+/* Web Sockets Shit */
 
 int main() {