diff --git a/xCAT-server/lib/xcat/plugins/blade.pm b/xCAT-server/lib/xcat/plugins/blade.pm
index 22c56f316..901fda01e 100644
--- a/xCAT-server/lib/xcat/plugins/blade.pm
+++ b/xCAT-server/lib/xcat/plugins/blade.pm
@@ -300,9 +300,6 @@ sub walkelog {
   } while ($varbind->[31] and $varbind->[31]->[2] ne 'NOSUCHINSTANCE' and ($current < 2000));
 
   return $retmap;
-  print "Count was $current\n";
-  #print Dumper($varbind->[60]->[2]);
-  print "\n\n";
   return undef;
   my $count=0;
   while ($varbind->[0] =~ /^$oid\.?(.*)/) {
diff --git a/xCAT-server/lib/xcat/plugins/ipmi.pm b/xCAT-server/lib/xcat/plugins/ipmi.pm
index c150c1a15..dfe9f354e 100644
--- a/xCAT-server/lib/xcat/plugins/ipmi.pm
+++ b/xCAT-server/lib/xcat/plugins/ipmi.pm
@@ -1004,7 +1004,6 @@ sub getrvidparms {
         return;
     }
     #TODO: use get bmc capabilities to see if rvid is actually supported before bothering the client java app
-    print "my turn\n";
     $sessdata->{ipmisession}->subcmd(netfn=>0x3a,command=>0x50,data=>[],callback=>\&getrvidparms_with_buildid,callback_args=>$sessdata);
 }
 sub check_rsp_errors { #TODO: pass in command-specfic error code translation table
@@ -1056,7 +1055,6 @@ sub getrvidparms_with_buildid {
     $jnlp =~ s!argument>title=.*Video Viewer</argument>!argument>title=$currnode wvid</argument>!;
     sendmsg("method:imm",$sessdata->{node});
     sendmsg("jnlp:$jnlp",$sessdata->{node});
-    print "jnlp:$jnlp";
     my @cmdargv = @{$sessdata->{extraargs}};
     if (grep /-m/,@cmdargv) {
         $response = $browser->request(GET $baseurl."/kvm/vm/jnlp");
@@ -2125,7 +2123,6 @@ sub readcurrfrudevice {
         if ($rsp->{code} != 0xcb and check_rsp_errors($rsp,$sessdata)) {
             return;
         } elsif ($rsp->{code} == 0xcb) {
-            print "Oh no..".$sessdata->{currfruid}."\n";
             $sessdata->{currfrudata}="Not Present";
             $sessdata->{currfrudone}=1;
             add_fruhash($sessdata);
diff --git a/xCAT-server/lib/xcat/plugins/kvm.pm b/xCAT-server/lib/xcat/plugins/kvm.pm
index 02641c392..08eef0733 100644
--- a/xCAT-server/lib/xcat/plugins/kvm.pm
+++ b/xCAT-server/lib/xcat/plugins/kvm.pm
@@ -91,7 +91,6 @@ sub get_path_for_nfsuri {
     $diskname =~ /nfs:\/\/([^\/]*)(\/.*)/;
     my $server = $1;
     my $path = $2;
-    print $diskname." $server $path \n";
     if (xCAT::Utils::thishostisnot($server)) {
         return [$server,$path];
     } else { #I am the server
@@ -1011,10 +1010,8 @@ sub process_request {
       my $state = $exargs[0];
       if ($state eq 'vmoff') {
           $vmtab->setNodeAttribs($exargs[1],{powerstate=>'off'});
-          print "Completion?\n";
           return;
       } elsif ($state eq 'vmon') {
-          print "Completion?\n";
           $vmtab->setNodeAttribs($exargs[1],{powerstate=>'on'});
           return;
       } elsif ($state eq 'hypshutdown') { #turn this into an evacuate
diff --git a/xCAT-server/sbin/xcatd b/xCAT-server/sbin/xcatd
index 9a3a0ef11..4a237cb61 100755
--- a/xCAT-server/sbin/xcatd
+++ b/xCAT-server/sbin/xcatd
@@ -1581,7 +1581,7 @@ sub validate {
   # check to see if peerhost is trusted
   foreach $rule (@$policies) {
      
-    if (($rule->{name} eq $peerhost)  && ($rule->{rule}=~ /trusted/i)) {
+    if (($rule->{name} and ($rule->{name} eq $peerhost))  && ($rule->{rule}=~ /trusted/i)) {
      $peerstatus="Trusted";
      last;
     }
@@ -1674,7 +1674,7 @@ sub validate {
 
              $arglist .= " " . $argument;
       }
-      $logst .= $arglist;
+      if ($arglist) { $logst .= $arglist; }
       if($peername) { $logst .= " for " . $request->{username}->[0]};
       if ($peerhost) { $logst .= " from " . $peerhost };
       # put in audit Table