diff --git a/fhem/FHEM/55_GDS.pm b/fhem/FHEM/55_GDS.pm
index 812caa01b..8dfc529f8 100644
--- a/fhem/FHEM/55_GDS.pm
+++ b/fhem/FHEM/55_GDS.pm
@@ -132,7 +132,7 @@ sub GDS_Undef($$) {
 	my $name = $hash->{NAME};
 	RemoveInternalTimer($hash);
     my $url = '/gds';
-    $data{FWEXT}{$url} = undef if int(devspec2array('TYPE=GDS')) == 1;
+    delete $data{FWEXT}{$url} if int(devspec2array('TYPE=GDS')) == 1;
 	return undef;
 }
 
diff --git a/fhem/contrib/InfoPanel/55_InfoPanel.pm b/fhem/contrib/InfoPanel/55_InfoPanel.pm
index cc26e6332..855e0510e 100644
--- a/fhem/contrib/InfoPanel/55_InfoPanel.pm
+++ b/fhem/contrib/InfoPanel/55_InfoPanel.pm
@@ -114,7 +114,7 @@ sub btIP_Undef($$) {
 	my ($hash, $arg) = @_;
     # check if last device
     my $url = '/btip';
-    $data{FWEXT}{$url} = undef if int(devspec2array('TYPE=InfoPanel')) == 1;
+    delete $data{FWEXT}{$url} if int(devspec2array('TYPE=InfoPanel')) == 1;
 	return undef;
 }
 
@@ -324,19 +324,6 @@ sub btIP_itemImg {
   return $output;
 }
 
-# # embed link to plot
-# #
-#     my $url;
-#     $url  = "$FW_ME/SVG_showLog?dev=". $plotName[0].
-#           "&logdev=".            InternalVal($plotName[0], "LOGDEVICE", "").
-#           "&gplotfile=".         InternalVal($plotName[0], "GPLOTFILE", "").
-#           "&logfile=".           InternalVal($plotName[0], "LOGFILE", "CURRENT").
-#           "&plotsize=".          "$newWidth,$newHeight";
-#      $url .= "&pos=".            ($plotName[1]) ? $plotName[1] : 'day';
-#      $url .= "&zoom=".           ($plotName[2]) ? $plotName[2] : undef;
-# 
-#     $output = "<image id=\"$id\" x=\"$x\" y=\"$y\" width=\"".$width."px\" height=\"".$height."px\" \nxlink:href=\"$url\" />\n";
-
 sub _btIP_imgData {
   my ($arg,$scale) = @_;
   my $info     = image_info(\$arg);