@@ -809,70 +809,10 @@
 - (uint16_t)port
 {
 	return _port;
 }
 
-- (void)setUsesTLS: (bool)usesTLS
-{
-	if (_listeningSocket != nil)
-		@throw [OFAlreadyConnectedException exception];
-
-	_usesTLS = usesTLS;
-}
-
-- (bool)usesTLS
-{
-	return _usesTLS;
-}
-
-- (void)setCertificateFile: (OFString *)certificateFile
-{
-	OFString *old;
-
-	if (_listeningSocket != nil)
-		@throw [OFAlreadyConnectedException exception];
-
-	old = _certificateFile;
-	_certificateFile = [certificateFile copy];
-	[old release];
-}
-
-- (OFString *)certificateFile
-{
-	return _certificateFile;
-}
-
-- (void)setPrivateKeyFile: (OFString *)privateKeyFile
-{
-	OFString *old;
-
-	if (_listeningSocket != nil)
-		@throw [OFAlreadyConnectedException exception];
-
-	old = _privateKeyFile;
-	_privateKeyFile = [privateKeyFile copy];
-	[old release];
-}
-
-- (OFString *)privateKeyFile
-{
-	return _privateKeyFile;
-}
-
-- (void)setPrivateKeyPassphrase: (const char *)privateKeyPassphrase
-{
-	if (_listeningSocket != nil)
-		@throw [OFAlreadyConnectedException exception];
-
-	_privateKeyPassphrase = privateKeyPassphrase;
-}
-
-- (const char *)privateKeyPassphrase
-{
-	return _privateKeyPassphrase;
-}
-
 #ifdef OF_HAVE_THREADS
 - (void)setNumberOfThreads: (size_t)numberOfThreads
 {
 	if (numberOfThreads == 0)
 		@throw [OFInvalidArgumentException exception];
@@ -897,25 +837,11 @@
 		@throw [OFInvalidArgumentException exception];
 
 	if (_listeningSocket != nil)
 		@throw [OFAlreadyConnectedException exception];
 
-	if (_usesTLS) {
-		OFTCPSocket <OFTLSSocket> *TLSSocket;
-
-		if (OFTLSSocketClass == Nil)
-			@throw [OFUnsupportedProtocolException exception];
-
-		TLSSocket = [[OFTLSSocketClass alloc] init];
-		_listeningSocket = TLSSocket;
-
-		TLSSocket.certificateFile = _certificateFile;
-		TLSSocket.privateKeyFile = _privateKeyFile;
-		TLSSocket.privateKeyPassphrase = _privateKeyPassphrase;
-	} else
-		_listeningSocket = [[OFTCPSocket alloc] init];
-
+	_listeningSocket = [[OFTCPSocket alloc] init];
 	_port = [_listeningSocket bindToHost: _host port: _port];
 	[_listeningSocket listen];
 
 #ifdef OF_HAVE_THREADS
 	if (_numberOfThreads > 1) {