diff --git a/Lib/Protocols/IdSSL.pas b/Lib/Protocols/IdSSL.pas
index b7150c8f1..cc49bedab 100644
--- a/Lib/Protocols/IdSSL.pas
+++ b/Lib/Protocols/IdSSL.pas
@@ -116,64 +116,11 @@    TIdServerIOHandlerSSLBase = class(TIdServerIOHandler)
   TIdClientSSLClass = class of TIdSSLIOHandlerSocketBase;
   TIdServerSSLClass = class of TIdServerIOHandlerSSLBase;
 
-Procedure RegisterSSL(const AProduct, AVendor, ACopyright,
-  ADescription, AURL : String;
-  const AClientClass : TIdClientSSLClass; const AServerClass : TIdServerSSLClass);
-
-type
-  TIdSSLRegEntry = class(TCollectionItem)
-  protected
-    FProductName : String;
-    FVendor : String;
-    FCopyright : String;
-    FDescription : String;
-    FURL : String;
-    FClientClass : TIdClientSSLClass;
-    FServerClass : TIdServerSSLClass;
-  public
-    property ProductName : String read FProductName write FProductName;
-    property Vendor : String read FVendor write FVendor;
-    property Copyright : String read  FCopyright write  FCopyright;
-    property Description : String read FDescription write FDescription;
-    property URL : String read FURL write FURL;
-    property ClientClass : TIdClientSSLClass read FClientClass write FClientClass;
-    property ServerClass : TIdServerSSLClass read FServerClass write FServerClass;
-  end;
-
-  TIdSSLRegistry = class(TCollection)
-  protected
-    function GetItem ( Index: Integer ) : TIdSSLRegEntry;
-    procedure SetItem ( Index: Integer; const Value: TIdSSLRegEntry );
-  public
-    constructor Create; reintroduce;
-    function Add: TIdSSLRegEntry;
-    property Items [ Index: Integer ] : TIdSSLRegEntry read GetItem
-      write SetItem; default;
-  end;
-
-var
-  GSSLRegistry : TIdSSLRegistry;
-
 implementation
 
 uses
   SysUtils;
 
-Procedure RegisterSSL(const AProduct, AVendor, ACopyright,
-  ADescription, AURL : String;
-  const AClientClass : TIdClientSSLClass; const AServerClass : TIdServerSSLClass);
-var LR : TIdSSLRegEntry;
-begin
-  LR := GSSLRegistry.Add;
-  LR.ProductName := AProduct;
-  LR.Vendor := AVendor;
-  LR.Copyright := ACopyRight;
-  LR.Description := ADescription;
-  LR.URL := AURL;
-  LR.ClientClass := AClientClass;
-  LR.ServerClass := AServerClass;
-end;
-
 { TIdSSLIOHandlerSocketBase }
 
 procedure TIdSSLIOHandlerSocketBase.InitComponent;
@@ -218,31 +165,4 @@ function TIdServerIOHandlerSSLBase.MakeClientIOHandler(ATheThread:TIdYarn ): TId
   Result := MakeClientIOHandler;
 end;
 
-{ TIdSSLRegistry }
-
-function TIdSSLRegistry.Add: TIdSSLRegEntry;
-begin
-  Result := TIdSSLRegEntry( inherited Add );
-end;
-
-constructor TIdSSLRegistry.Create;
-begin
-  inherited Create(TIdSSLRegEntry);
-end;
-
-function TIdSSLRegistry.GetItem(Index: Integer): TIdSSLRegEntry;
-begin
-  Result := TIdSSLRegEntry ( inherited GetItem(Index) );
-end;
-
-procedure TIdSSLRegistry.SetItem(Index: Integer;
-  const Value: TIdSSLRegEntry);
-begin
-  inherited SetItem(Index,Value);
-end;
-
-initialization
-  GSSLRegistry := TIdSSLRegistry.Create;
-finalization
-  FreeAndNil(GSSLRegistry);
 end.
diff --git a/Lib/Protocols/IdSSLDotNET.pas b/Lib/Protocols/IdSSLDotNET.pas
index 9e0ff0441..a3b8dd8dc 100644
--- a/Lib/Protocols/IdSSLDotNET.pas
+++ b/Lib/Protocols/IdSSLDotNET.pas
@@ -568,14 +568,5 @@ procedure TIdServerIOHandlerSSLNET.Shutdown;
 end;
 
 initialization
-
-  RegisterSSL('Indy SSL Support for Microsoft.NET 2.0','Indy Pit Crew',                                  {do not localize}
-    'Copyright © 1993 - 2007'#10#13 +                                     {do not localize}
-    'Chad Z. Hower (Kudzu) and the Indy Pit Crew. All rights reserved.',  {do not localize}
-    'Open SSL Support DLL Delphi and C++Builder interface',               {do not localize}
-    'http://www.indyproject.org/'#10#13 +                                 {do not localize}
-    'Original Author - J. Peter Mugaas',                               {do not localize}
-    TIdSSLIOHandlerSocketNET,
-    TIdServerIOHandlerSSLNET);
   TIdSSLIOHandlerSocketNET.RegisterIOHandler;
 end.
diff --git a/Lib/Protocols/IdSSLOpenSSL.pas b/Lib/Protocols/IdSSLOpenSSL.pas
index 09c46eb40..d907c5dd6 100644
--- a/Lib/Protocols/IdSSLOpenSSL.pas
+++ b/Lib/Protocols/IdSSLOpenSSL.pas
@@ -4259,14 +4259,6 @@ function TIdSSLCipher.GetVersion:String;
 initialization
   Assert(SSLIsLoaded=nil);
   SSLIsLoaded := TIdThreadSafeBoolean.Create;
-  RegisterSSL('OpenSSL','Indy Pit Crew',                                  {do not localize}
-    'Copyright '+Char(169)+' 1993 - 2014'#10#13 +                                     {do not localize}
-    'Chad Z. Hower (Kudzu) and the Indy Pit Crew. All rights reserved.',  {do not localize}
-    'Open SSL Support DLL Delphi and C++Builder interface',               {do not localize}
-    'http://www.indyproject.org/'#10#13 +                                 {do not localize}
-    'Original Author - Gregor Ibic',                                        {do not localize}
-    TIdSSLIOHandlerSocketOpenSSL,
-    TIdServerIOHandlerSSLOpenSSL);
   TIdSSLIOHandlerSocketOpenSSL.RegisterIOHandler;
 finalization
   // TODO: TIdSSLIOHandlerSocketOpenSSL.UnregisterIOHandler;
diff --git a/Lib/Protocols/IdServerIOHandlerSSLOpenSSL.pas b/Lib/Protocols/IdServerIOHandlerSSLOpenSSL.pas
deleted file mode 100644
index c81c1c91e..000000000
--- a/Lib/Protocols/IdServerIOHandlerSSLOpenSSL.pas
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  $Project$
-  $Workfile$
-  $Revision$
-  $DateUTC$
-  $Id$
-
-  This file is part of the Indy (Internet Direct) project, and is offered
-  under the dual-licensing agreement described on the Indy website.
-  (http://www.indyproject.org/)
-
-  Copyright:
-   (c) 1993-2005, Chad Z. Hower and the Indy Pit Crew. All rights reserved.
-}
-{
-  $Log$
-}
-{
-Classes are now located in IdSSLOpenSSL
-}
-unit IdServerIOHandlerSSLOpenSSL;
-
-interface
-
-implementation
-
-end.