diff --git a/core/lib/Foswiki/Configure/Checkers/PROXY/UseForwardedFor.pm b/core/lib/Foswiki/Configure/Checkers/PROXY/UseForwardedFor.pm
deleted file mode 100755
index 4362163e8..000000000
--- a/core/lib/Foswiki/Configure/Checkers/PROXY/UseForwardedFor.pm
+++ /dev/null
@@ -1,68 +0,0 @@
-# See bottom of file for license and copyright information
-package Foswiki::Configure::Checkers::PROXY::UseForwardedFor;
-
-use strict;
-use warnings;
-
-use Foswiki::Configure::Checker ();
-our @ISA = ('Foswiki::Configure::Checker');
-
-sub check_current_value {
-    my ( $this, $reporter ) = @_;
-
-    if ( defined $Foswiki::cfg{Engine}
-        && substr( $Foswiki::cfg{Engine}, -3 ) eq 'CLI' )
-    {
-        my ( $client, $protocol, $host, $port, $proxy ) =
-          Foswiki::Engine::_getConnectionData(1);
-
-        if ($proxy) {
-
-            if ( $Foswiki::cfg{PROXY}{UseForwardedFor} ) {
-                $reporter->WARN(
-"Be sure you trust the proxy server. Clients can use this header to spoof their IP addresses."
-                );
-            }
-            else {
-                $reporter->WARN(
-"Proxy detected, Enable this switch if Foswiki should use the =X-Forwarded-For= header to obtain the real client IP address."
-                );
-            }
-            $reporter->NOTE(
-"Remote Address is $ENV{REMOTE_ADDR}, Real client IP is =$client=."
-            );
-        }
-        elsif ( $Foswiki::cfg{PROXY}{UseForwardedFor} ) {
-            $reporter->WARN(
-"You have enabled ={PROXY}{UseForwardedFor}= but a proxy was not detected. The =X-Forwarded-For= header can be used by clients to mask their real IP address. Be sure this is what you want to do."
-            );
-        }
-    }
-}
-
-1;
-__END__
-Foswiki - The Free and Open Source Wiki, http://foswiki.org/
-
-Copyright (C) 2008-2018 Foswiki Contributors. Foswiki Contributors
-are listed in the AUTHORS file in the root of this distribution.
-NOTE: Please extend that file, not this notice.
-
-Additional copyrights apply to some or all of the code in this
-file as follows:
-
-Copyright (C) 2000-2006 TWiki Contributors. All Rights Reserved.
-TWiki Contributors are listed in the AUTHORS file in the root
-of this distribution. NOTE: Please extend that file, not this notice.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version. For
-more details read LICENSE in the root of this distribution.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-As per the GPL, removal of this notice is prohibited.
diff --git a/core/lib/Foswiki/Configure/Checkers/PROXY/UseForwardedForHeader.pm b/core/lib/Foswiki/Configure/Checkers/PROXY/UseForwardedForHeader.pm
deleted file mode 100755
index f8c5af00a..000000000
--- a/core/lib/Foswiki/Configure/Checkers/PROXY/UseForwardedForHeader.pm
+++ /dev/null
@@ -1,55 +0,0 @@
-# See bottom of file for license and copyright information
-package Foswiki::Configure::Checkers::PROXY::UseForwardedForHeader;
-
-use strict;
-use warnings;
-
-use Foswiki::Configure::Checker ();
-our @ISA = ('Foswiki::Configure::Checker');
-
-sub check_current_value {
-    my ( $this, $reporter ) = @_;
-
-    if ( $ENV{HTTP_X_FORWARDED_FOR} ) {
-
-        if ( $Foswiki::cfg{PROXY}{UseForwardedForHeader} ) {
-            $reporter->NOTE("Real client IP is =$ENV{HTTP_X_FORWARDED_FOR}=.");
-        }
-        else {
-            $reporter->WARN(
-"Proxy detected, Enable this switch if Foswiki should use the =HTTP_X_FORWARDED_FOR= header to obtain the real client IP address."
-            );
-            $reporter->NOTE(
-"Remote Address is $ENV{REMOTE_ADDR}, Real client IP is =$ENV{HTTP_X_FORWARDED_FOR}=."
-            );
-        }
-    }
-
-}
-
-1;
-__END__
-Foswiki - The Free and Open Source Wiki, http://foswiki.org/
-
-Copyright (C) 2008-2017 Foswiki Contributors. Foswiki Contributors
-are listed in the AUTHORS file in the root of this distribution.
-NOTE: Please extend that file, not this notice.
-
-Additional copyrights apply to some or all of the code in this
-file as follows:
-
-Copyright (C) 2000-2006 TWiki Contributors. All Rights Reserved.
-TWiki Contributors are listed in the AUTHORS file in the root
-of this distribution. NOTE: Please extend that file, not this notice.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version. For
-more details read LICENSE in the root of this distribution.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-As per the GPL, removal of this notice is prohibited.