--- a/Socket.st	Tue Jan 28 23:21:00 2014 +0100
+++ b/Socket.st	Tue Jan 28 23:21:16 2014 +0100
@@ -733,12 +733,6 @@
     "
 !
 
-new
-    "create a TCP socket"
-
-    ^ super new buffered:false
-!
-
 newTCP
     "create a TCP socket - no binding or other setup is done,
      neither connect nor connect-wait is done."
@@ -1641,45 +1635,10 @@
 !
 
 sendData: aStringOrByteArray
-        "Send all of the data in the given array, even if it requires multiple calls to send it all.
-         Return the number of bytes sent."
-
-        |remaining nWritten offset|
-
-"/ Transcript show:'>> '; showCR:aStringOrByteArray.
-
-        remaining := aStringOrByteArray size.
-        offset := 1.
-        [remaining > 0] whileTrue:[
-            nWritten := self nextPutBytes:remaining from:aStringOrByteArray startingAt:offset.
-            nWritten == 0 ifTrue:[
-                "/ seems to be blocking - give others a chance to do something useful
-                "/ now (instead of spinning here until my timeslice ends)
-                self writeWait.
-                "/ Processor yield
-            ] ifFalse:[
-                remaining := remaining - nWritten.
-                offset := offset + nWritten.
-            ].
-        ].
-        ^ aStringOrByteArray size.
-
-        "An experimental version for use on slow lines:
-         Longer timeout and smaller writes to try to avoid spurious timeouts."
-
-"/        | bytesSent bytesToSend count |
-"/        bytesToSend := aStringOrByteArray size.
-"/        bytesSent := 0.
-"/        [bytesSent < bytesToSend] whileTrue: [
-"/                (self waitForSendDoneFor: 60)
-"/                        ifFalse: [ConnectionTimedOut signal: 'send data timeout; data not sent'].
-"/                count := self primSocket: socketHandle
-"/                        sendData: aStringOrByteArray
-"/                        startIndex: bytesSent + 1
-"/                        count: (bytesToSend - bytesSent min: 5000).
-"/                bytesSent := bytesSent + count].
-"/
-"/        ^ bytesSent
+    "Send all of the data in the given array, even if it requires multiple calls to send it all.
+     Return the number of bytes sent."
+
+    ^ self nextPutBytes:aStringOrByteArray size from:aStringOrByteArray startingAt:1.
 !
 
 setOption: optionName value: optionValue
@@ -4252,10 +4211,10 @@
 !Socket class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic2/Socket.st,v 1.294 2014-01-28 13:00:16 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic2/Socket.st,v 1.295 2014-01-28 22:21:16 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic2/Socket.st,v 1.294 2014-01-28 13:00:16 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic2/Socket.st,v 1.295 2014-01-28 22:21:16 stefan Exp $'
 ! !