Index: src/OFSocket.h
==================================================================
--- src/OFSocket.h
+++ src/OFSocket.h
@@ -53,17 +53,6 @@
 
 /**
  * Enables/disables non-blocking I/O.
  */
 - setBlocking: (BOOL)enable;
-
-- connectToService: (OFString*)service
-	    onNode: (OFString*)node;
-- bindService: (OFString*)service
-       onNode: (OFString*)node
-   withFamily: (int)family;
-- listenWithBackLog: (int)backlog;
-- listen;
-- (OFSocket*)accept;
-- enableKeepAlives: (BOOL)enable;
-- close;
 @end

Index: src/OFSocket.m
==================================================================
--- src/OFSocket.m
+++ src/OFSocket.m
@@ -110,51 +110,6 @@
 		@throw [OFSetOptionFailedException newWithClass: isa];
 #endif
 
 	return self;
 }
-
-- connectToService: (OFString*)service
-	    onNode: (OFString*)node
-{
-	@throw [OFNotImplementedException newWithClass: isa
-					      selector: _cmd];
-}
-
-- bindService: (OFString*)service
-       onNode: (OFString*)node
-   withFamily: (int)family
-{
-	@throw [OFNotImplementedException newWithClass: isa
-					      selector: _cmd];
-}
-
-- listenWithBackLog: (int)backlog
-{
-	@throw [OFNotImplementedException newWithClass: isa
-					      selector: _cmd];
-}
-
-- listen
-{
-	@throw [OFNotImplementedException newWithClass: isa
-					      selector: _cmd];
-}
-
-- (OFSocket*)accept
-{
-	@throw [OFNotImplementedException newWithClass: isa
-					      selector: _cmd];
-}
-
-- enableKeepAlives: (BOOL)enable
-{
-	@throw [OFNotImplementedException newWithClass: isa
-					      selector: _cmd];
-}
-
-- close
-{
-	@throw [OFNotImplementedException newWithClass: isa
-					      selector: _cmd];
-}
 @end

Index: src/OFTCPSocket.h
==================================================================
--- src/OFTCPSocket.h
+++ src/OFTCPSocket.h
@@ -51,17 +51,12 @@
 
 /**
  * Accept an incoming connection.
  * \return An autoreleased OFTCPSocket for the accepted connection.
  */
-- (OFSocket*)accept;
+- (OFTCPSocket*)accept;
 
 /**
  * Enable or disable keep alives for the connection.
  */
 - enableKeepAlives: (BOOL)enable;
-
-/**
- * Closes the socket.
- */
-- close;
 @end

Index: src/OFTCPSocket.m
==================================================================
--- src/OFTCPSocket.m
+++ src/OFTCPSocket.m
@@ -312,11 +312,11 @@
 						     backLog: 5];
 
 	return self;
 }
 
-- (OFSocket*)accept
+- (OFTCPSocket*)accept
 {
 	OFTCPSocket *newsock;
 	struct sockaddr *addr;
 	socklen_t addrlen;
 	int s;

Index: tests/OFTCPSocket.m
==================================================================
--- tests/OFTCPSocket.m
+++ tests/OFTCPSocket.m
@@ -27,11 +27,11 @@
 
 void
 tcpsocket_tests()
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
-	OFSocket *server, *client = nil, *accepted;
+	OFTCPSocket *server, *client = nil, *accepted;
 	OFString *service, *msg;
 	uint16_t port;
 	char buf[6];
 
 	srand(time(NULL));