diff --git a/fhem/FHEM/10_RESIDENTS.pm b/fhem/FHEM/10_RESIDENTS.pm
index 1a81a69ac..cec6d2ac5 100644
--- a/fhem/FHEM/10_RESIDENTS.pm
+++ b/fhem/FHEM/10_RESIDENTS.pm
@@ -32,7 +32,7 @@ use Time::Local;
 use Data::Dumper;
 require RESIDENTStk;
 
-no if $] >= 5.017011, warnings => 'experimental::smartmatch';
+no if $] >= 5.017011, warnings => 'experimental';
 
 sub RESIDENTS_Set($@);
 sub RESIDENTS_Define($$);
@@ -1583,8 +1583,8 @@ sub RESIDENTS_UpdateReadings (@) {
 
 =pod
 =item helper
-=item summary combines <a href="#ROOMMATE">ROOMMATE</a> and <a href="#GUEST">GUEST</a> devices to a residential community
-=item summary_de fasst <a href="#ROOMMATE">ROOMMATE</a> und <a href="#GUEST">GUEST</a> Ger&auml;te zu einer Wohngemeinschaft zusammen
+=item summary combines ROOMMATE and GUEST devices to a residential community
+=item summary_de fasst ROOMMATE und GUEST Ger&auml;te zu einer Wohngemeinschaft zusammen
 =begin html
 
     <p>
diff --git a/fhem/FHEM/20_GUEST.pm b/fhem/FHEM/20_GUEST.pm
index 8ff431549..bf70192e5 100644
--- a/fhem/FHEM/20_GUEST.pm
+++ b/fhem/FHEM/20_GUEST.pm
@@ -32,7 +32,7 @@ use Time::Local;
 use Data::Dumper;
 require RESIDENTStk;
 
-no if $] >= 5.017011, warnings => 'experimental::smartmatch';
+no if $] >= 5.017011, warnings => 'experimental';
 
 sub GUEST_Set($@);
 sub GUEST_Define($$);
diff --git a/fhem/FHEM/20_ROOMMATE.pm b/fhem/FHEM/20_ROOMMATE.pm
index 71bc72dcf..e39fd7ecc 100644
--- a/fhem/FHEM/20_ROOMMATE.pm
+++ b/fhem/FHEM/20_ROOMMATE.pm
@@ -32,7 +32,7 @@ use Time::Local;
 use Data::Dumper;
 require RESIDENTStk;
 
-no if $] >= 5.017011, warnings => 'experimental::smartmatch';
+no if $] >= 5.017011, warnings => 'experimental';
 
 sub ROOMMATE_Set($@);
 sub ROOMMATE_Define($$);
diff --git a/fhem/FHEM/50_HP1000.pm b/fhem/FHEM/50_HP1000.pm
index 0f7d5868e..0dd21e9b8 100755
--- a/fhem/FHEM/50_HP1000.pm
+++ b/fhem/FHEM/50_HP1000.pm
@@ -34,8 +34,6 @@ use Time::Local;
 use Data::Dumper;
 use FHEM::98_dewpoint;
 
-no if $] >= 5.017011, warnings => 'experimental::smartmatch';
-
 sub HP1000_Define($$);
 sub HP1000_Undefine($$);
 
diff --git a/fhem/FHEM/70_ENIGMA2.pm b/fhem/FHEM/70_ENIGMA2.pm
index fae113428..5622a1978 100644
--- a/fhem/FHEM/70_ENIGMA2.pm
+++ b/fhem/FHEM/70_ENIGMA2.pm
@@ -35,7 +35,7 @@ use IO::Socket;
 use HttpUtils;
 use Encode;
 
-no if $] >= 5.017011, warnings => 'experimental::smartmatch';
+no if $] >= 5.017011, warnings => 'experimental';
 
 no warnings "all";
 
@@ -546,12 +546,12 @@ sub ENIGMA2_Set($@) {
 
             my $commandKeys = join(
                 " ",
-                sort keys %{
+                keys %{
                     ENIGMA2_GetRemotecontrolCommand("GetRemotecontrolCommands")
                 }
             );
             if ( !defined( $a[2] ) ) {
-                return "No argument given, choose one of" . $commandKeys;
+                return "No argument given, choose one of " . $commandKeys;
             }
 
             my $request = ENIGMA2_GetRemotecontrolCommand( uc( $a[2] ) );
@@ -575,7 +575,7 @@ sub ENIGMA2_Set($@) {
                 return
                     "Unknown argument "
                   . $a[2]
-                  . ", choose one of"
+                  . ", choose one of "
                   . $commandKeys;
             }
 
diff --git a/fhem/FHEM/70_ONKYO_AVR.pm b/fhem/FHEM/70_ONKYO_AVR.pm
index 84e85de20..659cce176 100644
--- a/fhem/FHEM/70_ONKYO_AVR.pm
+++ b/fhem/FHEM/70_ONKYO_AVR.pm
@@ -39,8 +39,6 @@ use Data::Dumper;
 
 $Data::Dumper::Sortkeys = 1;
 
-no if $] >= 5.017011, warnings => 'experimental::smartmatch';
-
 sub ONKYO_AVR_Set($$$);
 sub ONKYO_AVR_Get($$$);
 sub ONKYO_AVR_Define($$$);
diff --git a/fhem/FHEM/70_Pushover.pm b/fhem/FHEM/70_Pushover.pm
index 62eba886b..43082f4c5 100644
--- a/fhem/FHEM/70_Pushover.pm
+++ b/fhem/FHEM/70_Pushover.pm
@@ -57,7 +57,7 @@ use HttpUtils;
 use SetExtensions;
 use Encode;
 
-no if $] >= 5.017011, warnings => 'experimental::smartmatch';
+no if $] >= 5.017011, warnings => 'experimental';
 
 my %sets = ( "msg" => 1 );
 
diff --git a/fhem/FHEM/71_ONKYO_AVR_ZONE.pm b/fhem/FHEM/71_ONKYO_AVR_ZONE.pm
index 3d52dbe9b..a625a9e5a 100644
--- a/fhem/FHEM/71_ONKYO_AVR_ZONE.pm
+++ b/fhem/FHEM/71_ONKYO_AVR_ZONE.pm
@@ -34,8 +34,6 @@ use Data::Dumper;
 
 $Data::Dumper::Sortkeys = 1;
 
-no if $] >= 5.017011, warnings => 'experimental::smartmatch';
-
 sub ONKYO_AVR_ZONE_Set($$$);
 sub ONKYO_AVR_ZONE_Get($$$);
 sub ONKYO_AVR_ZONE_Define($$$);
diff --git a/fhem/FHEM/75_MSG.pm b/fhem/FHEM/75_MSG.pm
index 0eb5dacd7..2252c87e9 100755
--- a/fhem/FHEM/75_MSG.pm
+++ b/fhem/FHEM/75_MSG.pm
@@ -38,7 +38,7 @@ use warnings;
 use Time::HiRes qw(time);
 use Data::Dumper;
 
-no if $] >= 5.017011, warnings => 'experimental::smartmatch';
+no if $] >= 5.017011, warnings => 'experimental';
 
 sub CommandMsg($$;$$);
 
@@ -2369,8 +2369,8 @@ s/^[\s\t]*([!]?(([A-Za-z0-9%+._-])*@([%+a-z0-9A-Z.-]+))[\w,@.!|:]*)[\s\t]+//
 
 =pod
 =item command
-=item summary dynamic routing of messages to FHEM devices and modules (push, e-mail, screen, audio)
-=item summary_DE dynamisches Routing f&uuml;r Nachrichten an FHEM Ger&auml;te und Module (Push, E-Mail, Bildschirm, Audio)
+=item summary dynamic routing of messages to FHEM devices and modules
+=item summary_DE dynamisches Routing f&uuml;r Nachrichten an FHEM Ger&auml;te und Module
 =begin html
 
 <a name="MSG"></a>
diff --git a/fhem/FHEM/75_msgConfig.pm b/fhem/FHEM/75_msgConfig.pm
index 684eb0284..077c30e55 100755
--- a/fhem/FHEM/75_msgConfig.pm
+++ b/fhem/FHEM/75_msgConfig.pm
@@ -37,8 +37,6 @@ use strict;
 use warnings;
 use Data::Dumper;
 
-no if $] >= 5.017011, warnings => 'experimental::smartmatch';
-
 sub msgConfig_Set($@);
 sub msgConfig_Get($@);
 sub msgConfig_Define($$);
diff --git a/fhem/FHEM/98_GEOFANCY.pm b/fhem/FHEM/98_GEOFANCY.pm
index 277ace8af..fc6b87bff 100755
--- a/fhem/FHEM/98_GEOFANCY.pm
+++ b/fhem/FHEM/98_GEOFANCY.pm
@@ -35,8 +35,6 @@ use HttpUtils;
 use Time::Local;
 use Data::Dumper;
 
-no if $] >= 5.017011, warnings => 'experimental::smartmatch';
-
 sub GEOFANCY_Set($@);
 sub GEOFANCY_Define($$);
 sub GEOFANCY_Undefine($$);
diff --git a/fhem/FHEM/RESIDENTStk.pm b/fhem/FHEM/RESIDENTStk.pm
index 828f26754..2026286cc 100644
--- a/fhem/FHEM/RESIDENTStk.pm
+++ b/fhem/FHEM/RESIDENTStk.pm
@@ -24,7 +24,7 @@
 #
 ##############################################################################
 
-no if $] >= 5.017011, warnings => 'experimental::smartmatch';
+no if $] >= 5.017011, warnings => 'experimental';
 
 #####################################
 # PRE-DEFINITION: wakeuptimer