diff --git a/Command.h b/Command.h
index 17f7d2c..6ba8824 100644
--- a/Command.h
+++ b/Command.h
@@ -1,8 +1,8 @@
 #ifndef __Command_h__
-# define __Command_h__
+#define __Command_h__
 
-# include "includes"
-# include "Object.h"
+#include "includes"
+#include "Object.h"
 
 namespace core {
    
diff --git a/Header.cpp b/Header.cpp
deleted file mode 100644
index 1138966..0000000
--- a/Header.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-#include "Header.h"
-#include "Log.h"
-
-namespace core {
-   
-   Header::Header(std::string data) : data(data) {
-      //   Log(LOG_DEBUG_4) << data;
-   }
-   
-   Header::~Header() {}
-   
-   std::string Header::requestMethod() {
-      return data.substr(0, data.find(" "));
-   }
-   
-   std::string Header::requestURL() {
-      std::string temp = data.substr(data.find(" ") + 1);
-      return temp.substr(0, temp.find(" "));
-   }
-   
-   std::string Header::requestProtocol() {
-      std::string line1 = data.substr(0, data.find("\r\n"));
-      return line1.substr(line1.rfind(" ") + 1);
-   }
-
-   std::string Header::getPath() {
-      std::string temp = requestURL().substr(requestURL().find('/'));
-      return temp.substr(0, temp.find('?'));
-   }
-
-   std::string Header::getCGIData() {
-      return requestURL().substr(requestURL().find('?') + 1);
-   }
-
-   std::string Header::getCookie(std::string cookie) {
-      // TODO: Should do a more solid processing of this format of data.
-      int ix = 0;
-      while(ix < data.length()) {
-         if(data.substr(ix, 7) == "Cookie:") {
-            ix += 7;
-            // TODO: Check for space here.
-            ix += 1;
-            int len = data.find("=", ix) - ix;
-            if(cookie == data.substr(ix, len)) {
-               ix += len + 1;
-               len = data.find("\r\n", ix) - ix;
-               return data.substr(ix, len);               
-            }
-         }
-         ix += data.find("\r\n", ix) - ix + 2;
-      }
-      return "";
-   }
-   
-}
-
-
-
diff --git a/Header.h b/Header.h
deleted file mode 100644
index c718010..0000000
--- a/Header.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef __Header_h__
-#define __Header_h__
-
-#include "includes"
-#include "Object.h"
-
-namespace core {
-   
-   class Header : public Object {
-      
-    public:
-      Header(std::string data);
-      ~Header();       
-      
-      std::string data;
-      
-      std::string requestMethod();
-      std::string requestURL();
-      std::string requestProtocol();
-      std::string getPath();
-      std::string getCGIData();
-      std::string getCookie(std::string cookie);
-      
-    private:
-      
-      //   vector<map<string, string>> header;
-       
-   };
-   
-}
-
-#endif
diff --git a/Response.cpp b/Response.cpp
deleted file mode 100644
index c8de11d..0000000
--- a/Response.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-#include "Response.h"
-#include "Log.h"
-
-namespace core {
-   
-   Response::Response() {}
-   Response::~Response() {}      
-   
-   std::string Response::getResponse(Mode mode) {
-      return getResponse("", mode);
-   }
-   
-   std::string Response::getResponse(std::string content, Mode mode) {
-      std::stringstream response;
-      response << protocol << " " << code << " " << text << CRLF;
-      for(std::map<std::string, std::string>::iterator item = header.begin(); item != header.end(); ++item)
-         response << item->first << ": " << item->second << CRLF;
-         
-      if(mimeType != "")
-        response << "Content-Type: " << mimeType << CRLF;
-      if(mode == LENGTH)
-        response << "Content-Length: " << content.length() << CRLF; 
-      else
-        response << "Transfer-Encoding: chunked" << CRLF;
-         
-      response << CRLF;
-      response << content;   
-      Log(LOG_DEBUG_4) << response.str();
-      return response.str();   
-   }
-   
-   void Response::setProtocol(std::string protocol) {
-      this->protocol = protocol;
-   }
-   
-   void Response::setCode(std::string code) {
-      this->code = code;
-   }
-   
-   void Response::setText(std::string text) {
-      this->text = text;
-   }
-   
-   void Response::setMimeType(std::string mimeType) {
-      this->mimeType = mimeType;
-   }
-   
-   void Response::addHeaderItem(std::string key, std::string value) {
-      header.insert(std::pair<std::string, std::string>(key, value));
-   }
-   
-   void Response::setCookie(std::string name, std::string value) {
-      addHeaderItem("Set-Cookie", name + "=" + value + ";");
-   }
-
-}
diff --git a/Response.h b/Response.h
deleted file mode 100644
index 932c84e..0000000
--- a/Response.h
+++ /dev/null
@@ -1,110 +0,0 @@
-#ifndef __Response_h__
-#define __Response_h__
-
-#include "includes"
-#include "Object.h"
-
-namespace core {
-   
-   ///
-   /// Response
-   ///
-   /// Use this object to build a response output for a protocol that uses headers
-   /// and responses as the main communications protocol.
-   ///
-   
-   class Response : public Object {
-      
-    public:
-      
-      enum Mode { LENGTH, STREAMING };
-      
-      ///
-      /// The constructor for the object.
-      ///
-      
-      Response();
-      
-      /// 
-      /// The destructor for the object.
-      ///
-      
-      ~Response();       
-      
-      ///
-      /// Returns the response generated from the contained values that
-      /// do not return a content length. Using this constructor ensures
-      /// a zero length Content-Length value.
-      ///
-      /// @return the complete response string to send to client.
-      ///
-      
-      std::string getResponse(Mode mode = LENGTH);
-      
-      ///
-      /// Returns the response plus the content passed as a parameter.
-      ///
-      /// This method will automatically generate the proper Content-Length
-      /// value for the response.
-      ///
-      /// @param content the content that will be provided on the response
-      /// message to the client.
-      ///
-      /// @return the complete response string to send to client.
-      ///
-      
-      std::string getResponse(std::string content, Mode mode = LENGTH);
-      
-      ///
-      /// Sets the protocol value for the response message. The protocol 
-      /// should match the header received.
-      ///
-      /// @param protocol the protocol value to return in response. 
-      ///
-      
-      void setProtocol(std::string protocol);
-      
-      ///
-      /// Sets the return code value for the response.
-      ///
-      /// @param code the response code value to return in the response.
-      ///
-      
-      void setCode(std::string code);
-      
-      ///
-      /// Sets the return code string value for the response.
-      ///
-      /// @param text the text value for the response code to return on 
-      /// the response.
-      ///
-      
-      void setText(std::string text);
-      
-      ///
-      /// Specifies the type of data that will be returned in this response.
-      ///
-      /// @param mimeType the mime type for the data.
-      ///
-      
-      void setMimeType(std::string mimeType);
-      
-      void addHeaderItem(std::string key, std::string value);
-      
-      void setCookie(std::string name, std::string value);
-      
-    private:
-      std::string protocol;
-      std::string code;
-      std::string text;
-      std::string mimeType;
-      
-      std::string CRLF = "\r\n";
-      
-      std::map<std::string, std::string> header;
-      
-   };
-   
-}
-
-#endif
diff --git a/ServerCore.mk b/ServerCore.mk
index 9fd7608..bc960f2 100644
--- a/ServerCore.mk
+++ b/ServerCore.mk
@@ -5,16 +5,16 @@
 ## Debug
 ProjectName            :=ServerCore
 ConfigurationName      :=Debug
-WorkspacePath          :=/home/barant
-ProjectPath            :=/home/barant/barant/ServerCore
+WorkspacePath          :=/home/bradarant/barant
+ProjectPath            :=/home/bradarant/barant/ServerCore
 IntermediateDirectory  :=./Debug
 OutDir                 := $(IntermediateDirectory)
 CurrentFileName        :=
 CurrentFilePath        :=
 CurrentFileFullPath    :=
-User                   :=root
-Date                   :=05/31/19
-CodeLitePath           :=/home/barant/.codelite
+User                   :=Brad Arant
+Date                   :=23/06/19
+CodeLitePath           :=/home/bradarant/.codelite
 LinkerName             :=/usr/bin/x86_64-linux-gnu-g++
 SharedObjectLinkerName :=/usr/bin/x86_64-linux-gnu-g++ -shared -fPIC
 ObjectSuffix           :=.o
@@ -60,9 +60,9 @@ AS       := /usr/bin/x86_64-linux-gnu-as
 ## User defined environment variables
 ##
 CodeLiteDir:=/usr/share/codelite
-Objects0=$(IntermediateDirectory)/Command.cpp$(ObjectSuffix) $(IntermediateDirectory)/ConsoleServer.cpp$(ObjectSuffix) $(IntermediateDirectory)/ConsoleSession.cpp$(ObjectSuffix) $(IntermediateDirectory)/EPoll.cpp$(ObjectSuffix) $(IntermediateDirectory)/Exception.cpp$(ObjectSuffix) $(IntermediateDirectory)/File.cpp$(ObjectSuffix) $(IntermediateDirectory)/Header.cpp$(ObjectSuffix) $(IntermediateDirectory)/IPAddress.cpp$(ObjectSuffix) $(IntermediateDirectory)/Log.cpp$(ObjectSuffix) $(IntermediateDirectory)/Response.cpp$(ObjectSuffix) \
-	$(IntermediateDirectory)/Session.cpp$(ObjectSuffix) $(IntermediateDirectory)/Socket.cpp$(ObjectSuffix) $(IntermediateDirectory)/TCPServerSocket.cpp$(ObjectSuffix) $(IntermediateDirectory)/TCPSocket.cpp$(ObjectSuffix) $(IntermediateDirectory)/Thread.cpp$(ObjectSuffix) $(IntermediateDirectory)/Timer.cpp$(ObjectSuffix) $(IntermediateDirectory)/TLSServerSocket.cpp$(ObjectSuffix) $(IntermediateDirectory)/TLSSession.cpp$(ObjectSuffix) $(IntermediateDirectory)/UDPServerSocket.cpp$(ObjectSuffix) $(IntermediateDirectory)/UDPSocket.cpp$(ObjectSuffix) \
-	$(IntermediateDirectory)/CommandList.cpp$(ObjectSuffix) $(IntermediateDirectory)/TerminalSession.cpp$(ObjectSuffix) $(IntermediateDirectory)/Service.cpp$(ObjectSuffix) 
+Objects0=$(IntermediateDirectory)/Command.cpp$(ObjectSuffix) $(IntermediateDirectory)/ConsoleServer.cpp$(ObjectSuffix) $(IntermediateDirectory)/ConsoleSession.cpp$(ObjectSuffix) $(IntermediateDirectory)/EPoll.cpp$(ObjectSuffix) $(IntermediateDirectory)/Exception.cpp$(ObjectSuffix) $(IntermediateDirectory)/File.cpp$(ObjectSuffix) $(IntermediateDirectory)/IPAddress.cpp$(ObjectSuffix) $(IntermediateDirectory)/Log.cpp$(ObjectSuffix) $(IntermediateDirectory)/Session.cpp$(ObjectSuffix) $(IntermediateDirectory)/Socket.cpp$(ObjectSuffix) \
+	$(IntermediateDirectory)/TCPServerSocket.cpp$(ObjectSuffix) $(IntermediateDirectory)/TCPSocket.cpp$(ObjectSuffix) $(IntermediateDirectory)/Thread.cpp$(ObjectSuffix) $(IntermediateDirectory)/Timer.cpp$(ObjectSuffix) $(IntermediateDirectory)/TLSServerSocket.cpp$(ObjectSuffix) $(IntermediateDirectory)/TLSSession.cpp$(ObjectSuffix) $(IntermediateDirectory)/UDPServerSocket.cpp$(ObjectSuffix) $(IntermediateDirectory)/UDPSocket.cpp$(ObjectSuffix) $(IntermediateDirectory)/CommandList.cpp$(ObjectSuffix) $(IntermediateDirectory)/TerminalSession.cpp$(ObjectSuffix) \
+	$(IntermediateDirectory)/Service.cpp$(ObjectSuffix) 
 
 
 
@@ -79,8 +79,8 @@ $(OutputFile): $(Objects)
 	@echo "" > $(IntermediateDirectory)/.d
 	@echo $(Objects0)  > $(ObjectsFileList)
 	$(AR) $(ArchiveOutputSwitch)$(OutputFile) @$(ObjectsFileList) $(ArLibs)
-	@$(MakeDirCommand) "/home/barant/.build-debug"
-	@echo rebuilt > "/home/barant/.build-debug/ServerCore"
+	@$(MakeDirCommand) "/home/bradarant/barant/.build-debug"
+	@echo rebuilt > "/home/bradarant/barant/.build-debug/ServerCore"
 
 MakeIntermediateDirs:
 	@test -d ./Debug || $(MakeDirCommand) ./Debug
@@ -96,7 +96,7 @@ PreBuild:
 ## Objects
 ##
 $(IntermediateDirectory)/Command.cpp$(ObjectSuffix): Command.cpp $(IntermediateDirectory)/Command.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/barant/barant/ServerCore/Command.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Command.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/bradarant/barant/ServerCore/Command.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Command.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/Command.cpp$(DependSuffix): Command.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Command.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Command.cpp$(DependSuffix) -MM Command.cpp
 
@@ -104,7 +104,7 @@ $(IntermediateDirectory)/Command.cpp$(PreprocessSuffix): Command.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Command.cpp$(PreprocessSuffix) Command.cpp
 
 $(IntermediateDirectory)/ConsoleServer.cpp$(ObjectSuffix): ConsoleServer.cpp $(IntermediateDirectory)/ConsoleServer.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/barant/barant/ServerCore/ConsoleServer.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ConsoleServer.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/bradarant/barant/ServerCore/ConsoleServer.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ConsoleServer.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/ConsoleServer.cpp$(DependSuffix): ConsoleServer.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ConsoleServer.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ConsoleServer.cpp$(DependSuffix) -MM ConsoleServer.cpp
 
@@ -112,7 +112,7 @@ $(IntermediateDirectory)/ConsoleServer.cpp$(PreprocessSuffix): ConsoleServer.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ConsoleServer.cpp$(PreprocessSuffix) ConsoleServer.cpp
 
 $(IntermediateDirectory)/ConsoleSession.cpp$(ObjectSuffix): ConsoleSession.cpp $(IntermediateDirectory)/ConsoleSession.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/barant/barant/ServerCore/ConsoleSession.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ConsoleSession.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/bradarant/barant/ServerCore/ConsoleSession.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ConsoleSession.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/ConsoleSession.cpp$(DependSuffix): ConsoleSession.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ConsoleSession.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ConsoleSession.cpp$(DependSuffix) -MM ConsoleSession.cpp
 
@@ -120,7 +120,7 @@ $(IntermediateDirectory)/ConsoleSession.cpp$(PreprocessSuffix): ConsoleSession.c
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ConsoleSession.cpp$(PreprocessSuffix) ConsoleSession.cpp
 
 $(IntermediateDirectory)/EPoll.cpp$(ObjectSuffix): EPoll.cpp $(IntermediateDirectory)/EPoll.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/barant/barant/ServerCore/EPoll.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/EPoll.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/bradarant/barant/ServerCore/EPoll.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/EPoll.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/EPoll.cpp$(DependSuffix): EPoll.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/EPoll.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/EPoll.cpp$(DependSuffix) -MM EPoll.cpp
 
@@ -128,7 +128,7 @@ $(IntermediateDirectory)/EPoll.cpp$(PreprocessSuffix): EPoll.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/EPoll.cpp$(PreprocessSuffix) EPoll.cpp
 
 $(IntermediateDirectory)/Exception.cpp$(ObjectSuffix): Exception.cpp $(IntermediateDirectory)/Exception.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/barant/barant/ServerCore/Exception.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Exception.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/bradarant/barant/ServerCore/Exception.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Exception.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/Exception.cpp$(DependSuffix): Exception.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Exception.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Exception.cpp$(DependSuffix) -MM Exception.cpp
 
@@ -136,23 +136,15 @@ $(IntermediateDirectory)/Exception.cpp$(PreprocessSuffix): Exception.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Exception.cpp$(PreprocessSuffix) Exception.cpp
 
 $(IntermediateDirectory)/File.cpp$(ObjectSuffix): File.cpp $(IntermediateDirectory)/File.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/barant/barant/ServerCore/File.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/File.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/bradarant/barant/ServerCore/File.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/File.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/File.cpp$(DependSuffix): File.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/File.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/File.cpp$(DependSuffix) -MM File.cpp
 
 $(IntermediateDirectory)/File.cpp$(PreprocessSuffix): File.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/File.cpp$(PreprocessSuffix) File.cpp
 
-$(IntermediateDirectory)/Header.cpp$(ObjectSuffix): Header.cpp $(IntermediateDirectory)/Header.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/barant/barant/ServerCore/Header.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Header.cpp$(ObjectSuffix) $(IncludePath)
-$(IntermediateDirectory)/Header.cpp$(DependSuffix): Header.cpp
-	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Header.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Header.cpp$(DependSuffix) -MM Header.cpp
-
-$(IntermediateDirectory)/Header.cpp$(PreprocessSuffix): Header.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Header.cpp$(PreprocessSuffix) Header.cpp
-
 $(IntermediateDirectory)/IPAddress.cpp$(ObjectSuffix): IPAddress.cpp $(IntermediateDirectory)/IPAddress.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/barant/barant/ServerCore/IPAddress.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/IPAddress.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/bradarant/barant/ServerCore/IPAddress.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/IPAddress.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/IPAddress.cpp$(DependSuffix): IPAddress.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/IPAddress.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/IPAddress.cpp$(DependSuffix) -MM IPAddress.cpp
 
@@ -160,23 +152,15 @@ $(IntermediateDirectory)/IPAddress.cpp$(PreprocessSuffix): IPAddress.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/IPAddress.cpp$(PreprocessSuffix) IPAddress.cpp
 
 $(IntermediateDirectory)/Log.cpp$(ObjectSuffix): Log.cpp $(IntermediateDirectory)/Log.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/barant/barant/ServerCore/Log.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Log.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/bradarant/barant/ServerCore/Log.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Log.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/Log.cpp$(DependSuffix): Log.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Log.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Log.cpp$(DependSuffix) -MM Log.cpp
 
 $(IntermediateDirectory)/Log.cpp$(PreprocessSuffix): Log.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Log.cpp$(PreprocessSuffix) Log.cpp
 
-$(IntermediateDirectory)/Response.cpp$(ObjectSuffix): Response.cpp $(IntermediateDirectory)/Response.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/barant/barant/ServerCore/Response.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Response.cpp$(ObjectSuffix) $(IncludePath)
-$(IntermediateDirectory)/Response.cpp$(DependSuffix): Response.cpp
-	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Response.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Response.cpp$(DependSuffix) -MM Response.cpp
-
-$(IntermediateDirectory)/Response.cpp$(PreprocessSuffix): Response.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Response.cpp$(PreprocessSuffix) Response.cpp
-
 $(IntermediateDirectory)/Session.cpp$(ObjectSuffix): Session.cpp $(IntermediateDirectory)/Session.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/barant/barant/ServerCore/Session.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Session.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/bradarant/barant/ServerCore/Session.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Session.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/Session.cpp$(DependSuffix): Session.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Session.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Session.cpp$(DependSuffix) -MM Session.cpp
 
@@ -184,7 +168,7 @@ $(IntermediateDirectory)/Session.cpp$(PreprocessSuffix): Session.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Session.cpp$(PreprocessSuffix) Session.cpp
 
 $(IntermediateDirectory)/Socket.cpp$(ObjectSuffix): Socket.cpp $(IntermediateDirectory)/Socket.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/barant/barant/ServerCore/Socket.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Socket.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/bradarant/barant/ServerCore/Socket.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Socket.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/Socket.cpp$(DependSuffix): Socket.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Socket.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Socket.cpp$(DependSuffix) -MM Socket.cpp
 
@@ -192,7 +176,7 @@ $(IntermediateDirectory)/Socket.cpp$(PreprocessSuffix): Socket.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Socket.cpp$(PreprocessSuffix) Socket.cpp
 
 $(IntermediateDirectory)/TCPServerSocket.cpp$(ObjectSuffix): TCPServerSocket.cpp $(IntermediateDirectory)/TCPServerSocket.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/barant/barant/ServerCore/TCPServerSocket.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/TCPServerSocket.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/bradarant/barant/ServerCore/TCPServerSocket.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/TCPServerSocket.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/TCPServerSocket.cpp$(DependSuffix): TCPServerSocket.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/TCPServerSocket.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/TCPServerSocket.cpp$(DependSuffix) -MM TCPServerSocket.cpp
 
@@ -200,7 +184,7 @@ $(IntermediateDirectory)/TCPServerSocket.cpp$(PreprocessSuffix): TCPServerSocket
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/TCPServerSocket.cpp$(PreprocessSuffix) TCPServerSocket.cpp
 
 $(IntermediateDirectory)/TCPSocket.cpp$(ObjectSuffix): TCPSocket.cpp $(IntermediateDirectory)/TCPSocket.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/barant/barant/ServerCore/TCPSocket.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/TCPSocket.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/bradarant/barant/ServerCore/TCPSocket.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/TCPSocket.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/TCPSocket.cpp$(DependSuffix): TCPSocket.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/TCPSocket.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/TCPSocket.cpp$(DependSuffix) -MM TCPSocket.cpp
 
@@ -208,7 +192,7 @@ $(IntermediateDirectory)/TCPSocket.cpp$(PreprocessSuffix): TCPSocket.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/TCPSocket.cpp$(PreprocessSuffix) TCPSocket.cpp
 
 $(IntermediateDirectory)/Thread.cpp$(ObjectSuffix): Thread.cpp $(IntermediateDirectory)/Thread.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/barant/barant/ServerCore/Thread.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Thread.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/bradarant/barant/ServerCore/Thread.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Thread.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/Thread.cpp$(DependSuffix): Thread.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Thread.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Thread.cpp$(DependSuffix) -MM Thread.cpp
 
@@ -216,7 +200,7 @@ $(IntermediateDirectory)/Thread.cpp$(PreprocessSuffix): Thread.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Thread.cpp$(PreprocessSuffix) Thread.cpp
 
 $(IntermediateDirectory)/Timer.cpp$(ObjectSuffix): Timer.cpp $(IntermediateDirectory)/Timer.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/barant/barant/ServerCore/Timer.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Timer.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/bradarant/barant/ServerCore/Timer.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Timer.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/Timer.cpp$(DependSuffix): Timer.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Timer.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Timer.cpp$(DependSuffix) -MM Timer.cpp
 
@@ -224,7 +208,7 @@ $(IntermediateDirectory)/Timer.cpp$(PreprocessSuffix): Timer.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Timer.cpp$(PreprocessSuffix) Timer.cpp
 
 $(IntermediateDirectory)/TLSServerSocket.cpp$(ObjectSuffix): TLSServerSocket.cpp $(IntermediateDirectory)/TLSServerSocket.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/barant/barant/ServerCore/TLSServerSocket.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/TLSServerSocket.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/bradarant/barant/ServerCore/TLSServerSocket.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/TLSServerSocket.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/TLSServerSocket.cpp$(DependSuffix): TLSServerSocket.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/TLSServerSocket.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/TLSServerSocket.cpp$(DependSuffix) -MM TLSServerSocket.cpp
 
@@ -232,7 +216,7 @@ $(IntermediateDirectory)/TLSServerSocket.cpp$(PreprocessSuffix): TLSServerSocket
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/TLSServerSocket.cpp$(PreprocessSuffix) TLSServerSocket.cpp
 
 $(IntermediateDirectory)/TLSSession.cpp$(ObjectSuffix): TLSSession.cpp $(IntermediateDirectory)/TLSSession.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/barant/barant/ServerCore/TLSSession.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/TLSSession.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/bradarant/barant/ServerCore/TLSSession.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/TLSSession.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/TLSSession.cpp$(DependSuffix): TLSSession.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/TLSSession.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/TLSSession.cpp$(DependSuffix) -MM TLSSession.cpp
 
@@ -240,7 +224,7 @@ $(IntermediateDirectory)/TLSSession.cpp$(PreprocessSuffix): TLSSession.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/TLSSession.cpp$(PreprocessSuffix) TLSSession.cpp
 
 $(IntermediateDirectory)/UDPServerSocket.cpp$(ObjectSuffix): UDPServerSocket.cpp $(IntermediateDirectory)/UDPServerSocket.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/barant/barant/ServerCore/UDPServerSocket.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/UDPServerSocket.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/bradarant/barant/ServerCore/UDPServerSocket.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/UDPServerSocket.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/UDPServerSocket.cpp$(DependSuffix): UDPServerSocket.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/UDPServerSocket.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/UDPServerSocket.cpp$(DependSuffix) -MM UDPServerSocket.cpp
 
@@ -248,7 +232,7 @@ $(IntermediateDirectory)/UDPServerSocket.cpp$(PreprocessSuffix): UDPServerSocket
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/UDPServerSocket.cpp$(PreprocessSuffix) UDPServerSocket.cpp
 
 $(IntermediateDirectory)/UDPSocket.cpp$(ObjectSuffix): UDPSocket.cpp $(IntermediateDirectory)/UDPSocket.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/barant/barant/ServerCore/UDPSocket.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/UDPSocket.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/bradarant/barant/ServerCore/UDPSocket.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/UDPSocket.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/UDPSocket.cpp$(DependSuffix): UDPSocket.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/UDPSocket.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/UDPSocket.cpp$(DependSuffix) -MM UDPSocket.cpp
 
@@ -256,7 +240,7 @@ $(IntermediateDirectory)/UDPSocket.cpp$(PreprocessSuffix): UDPSocket.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/UDPSocket.cpp$(PreprocessSuffix) UDPSocket.cpp
 
 $(IntermediateDirectory)/CommandList.cpp$(ObjectSuffix): CommandList.cpp $(IntermediateDirectory)/CommandList.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/barant/barant/ServerCore/CommandList.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/CommandList.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/bradarant/barant/ServerCore/CommandList.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/CommandList.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/CommandList.cpp$(DependSuffix): CommandList.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/CommandList.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/CommandList.cpp$(DependSuffix) -MM CommandList.cpp
 
@@ -264,7 +248,7 @@ $(IntermediateDirectory)/CommandList.cpp$(PreprocessSuffix): CommandList.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/CommandList.cpp$(PreprocessSuffix) CommandList.cpp
 
 $(IntermediateDirectory)/TerminalSession.cpp$(ObjectSuffix): TerminalSession.cpp $(IntermediateDirectory)/TerminalSession.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/barant/barant/ServerCore/TerminalSession.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/TerminalSession.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/bradarant/barant/ServerCore/TerminalSession.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/TerminalSession.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/TerminalSession.cpp$(DependSuffix): TerminalSession.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/TerminalSession.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/TerminalSession.cpp$(DependSuffix) -MM TerminalSession.cpp
 
@@ -272,7 +256,7 @@ $(IntermediateDirectory)/TerminalSession.cpp$(PreprocessSuffix): TerminalSession
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/TerminalSession.cpp$(PreprocessSuffix) TerminalSession.cpp
 
 $(IntermediateDirectory)/Service.cpp$(ObjectSuffix): Service.cpp $(IntermediateDirectory)/Service.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/barant/barant/ServerCore/Service.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Service.cpp$(ObjectSuffix) $(IncludePath)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/bradarant/barant/ServerCore/Service.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Service.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/Service.cpp$(DependSuffix): Service.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Service.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Service.cpp$(DependSuffix) -MM Service.cpp
 
diff --git a/ServerCore.project b/ServerCore.project
index 4ffe857..2699676 100644
--- a/ServerCore.project
+++ b/ServerCore.project
@@ -104,16 +104,12 @@
     <File Name="Exception.h"/>
     <File Name="File.cpp"/>
     <File Name="File.h"/>
-    <File Name="Header.cpp"/>
-    <File Name="Header.h"/>
     <File Name="includes"/>
     <File Name="IPAddress.cpp"/>
     <File Name="IPAddress.h"/>
     <File Name="Log.cpp"/>
     <File Name="Log.h"/>
     <File Name="Object.h"/>
-    <File Name="Response.cpp"/>
-    <File Name="Response.h"/>
     <File Name="ServerCore.txt"/>
     <File Name="Session.cpp"/>
     <File Name="Session.h"/>
diff --git a/ServerCore.txt b/ServerCore.txt
index 47147f7..9699d85 100644
--- a/ServerCore.txt
+++ b/ServerCore.txt
@@ -1 +1 @@
-./Debug/Command.cpp.o ./Debug/ConsoleServer.cpp.o ./Debug/ConsoleSession.cpp.o ./Debug/EPoll.cpp.o ./Debug/Exception.cpp.o ./Debug/File.cpp.o ./Debug/Header.cpp.o ./Debug/IPAddress.cpp.o ./Debug/Log.cpp.o ./Debug/Response.cpp.o ./Debug/Session.cpp.o ./Debug/Socket.cpp.o ./Debug/TCPServerSocket.cpp.o ./Debug/TCPSocket.cpp.o ./Debug/Thread.cpp.o ./Debug/Timer.cpp.o ./Debug/TLSServerSocket.cpp.o ./Debug/TLSSession.cpp.o ./Debug/UDPServerSocket.cpp.o ./Debug/UDPSocket.cpp.o ./Debug/CommandList.cpp.o ./Debug/TerminalSession.cpp.o ./Debug/Service.cpp.o
+./Debug/Command.cpp.o ./Debug/ConsoleServer.cpp.o ./Debug/ConsoleSession.cpp.o ./Debug/EPoll.cpp.o ./Debug/Exception.cpp.o ./Debug/File.cpp.o ./Debug/IPAddress.cpp.o ./Debug/Log.cpp.o ./Debug/Session.cpp.o ./Debug/Socket.cpp.o ./Debug/TCPServerSocket.cpp.o ./Debug/TCPSocket.cpp.o ./Debug/Thread.cpp.o ./Debug/Timer.cpp.o ./Debug/TLSServerSocket.cpp.o ./Debug/TLSSession.cpp.o ./Debug/UDPServerSocket.cpp.o ./Debug/UDPSocket.cpp.o ./Debug/CommandList.cpp.o ./Debug/TerminalSession.cpp.o ./Debug/Service.cpp.o
diff --git a/TLSSession.cpp b/TLSSession.cpp
index c9c0c41..f38b2d1 100644
--- a/TLSSession.cpp
+++ b/TLSSession.cpp
@@ -53,8 +53,8 @@ namespace core {
       if((ret = SSL_set_fd(ssl, getDescriptor())) == 0)
 	throw std::string("Error setting TLS socket descriptor.");     
       
-      if(!SSL_set_generate_session_id(ssl, generate_session_id))
-	throw std::string("Error setting session identifier callback.");
+//      if(!SSL_set_generate_session_id(ssl, generate_session_id))
+//	throw std::string("Error setting session identifier callback.");
       
       switch (SSL_get_error(ssl, SSL_accept(ssl))) {
        case SSL_ERROR_SSL: