--- a/C++/modules/Socket/Socket.cpp	Tue Jun 30 15:17:01 2015 +0200
+++ b/C++/modules/Socket/Socket.cpp	Fri Jul 03 13:02:05 2015 +0200
@@ -26,7 +26,7 @@
  * -------------------------------------------------------- */
 
 #if defined(_WIN32)
-const Socket::Handle SocketAbstract::Invalid{INVALID_SOCKET};
+const SocketAbstract::Handle SocketAbstract::Invalid{INVALID_SOCKET};
 const int SocketAbstract::Error{SOCKET_ERROR};
 #else
 const int SocketAbstract::Invalid{-1};
@@ -121,18 +121,14 @@
 	if (m_handle == Invalid) {
 		throw SocketError{SocketError::System, "socket"};
 	}
-
-	m_state = SocketState::Opened;
 }
 
 SocketAbstract::SocketAbstract(SocketAbstract &&other) noexcept
 {
 	m_handle = other.m_handle;
-	m_state = other.m_state;
 
 	// Invalidate other
 	other.m_handle = -1;
-	other.m_state = SocketState::Closed;
 }
 
 SocketAbstract::~SocketAbstract()
@@ -142,14 +138,13 @@
 
 void SocketAbstract::close()
 {
-	if (m_state != SocketState::Closed) {
+	if (m_handle != Invalid) {
 #if defined(_WIN32)
 		::closesocket(m_handle);
 #else
 		::close(m_handle);
 #endif
 		m_handle = Invalid;
-		m_state = SocketState::Closed;
 	}
 }
 
@@ -183,11 +178,9 @@
 SocketAbstract &SocketAbstract::operator=(SocketAbstract &&other) noexcept
 {
 	m_handle = other.m_handle;
-	m_state = other.m_state;
 
 	// Invalidate other
 	other.m_handle = Invalid;
-	other.m_state = SocketState::Closed;
 
 	return *this;
 }