diff --git a/lib/puppet/util/network_device/transport/ssh.rb b/lib/puppet/util/network_device/transport/ssh.rb
index fb738ea40..6920874ed 100644
--- a/lib/puppet/util/network_device/transport/ssh.rb
+++ b/lib/puppet/util/network_device/transport/ssh.rb
@@ -1,121 +1,121 @@
 
 require 'puppet/util/network_device'
 require 'puppet/util/network_device/transport'
 require 'puppet/util/network_device/transport/base'
 
 # This is an adaptation/simplification of gem net-ssh-telnet, which aims to have
 # a sane interface to Net::SSH. Credits goes to net-ssh-telnet authors
 class Puppet::Util::NetworkDevice::Transport::Ssh < Puppet::Util::NetworkDevice::Transport::Base
 
   attr_accessor :buf, :ssh, :channel
 
   def initialize
     super
     unless Puppet.features.ssh?
       raise 'Connecting with ssh to a network device requires the \'net/ssh\' ruby library'
     end
   end
 
   def handles_login?
     true
   end
 
   def eof?
     !! @eof
   end
 
   def connect(&block)
     @output = []
     @channel_data = ""
 
     begin
       Puppet.debug("connecting to #{host} as #{user}")
       @ssh = Net::SSH.start(host, user, :port => port, :password => password, :timeout => timeout)
     rescue TimeoutError
       raise TimeoutError, "timed out while opening an ssh connection to the host"
     rescue Net::SSH::AuthenticationFailed
       raise Puppet::Error, "SSH authentication failure connecting to #{host} as #{user}"
     rescue Net::SSH::Exception => detail
       raise Puppet::Error, "SSH connection failure to #{host}"
     end
 
     @buf = ""
     @eof = false
     @channel = nil
     @ssh.open_channel do |channel|
       channel.request_pty { |ch,success| raise "failed to open pty" unless success }
 
       channel.send_channel_request("shell") do |ch, success|
         raise "failed to open ssh shell channel" unless success
 
         ch.on_data { |ch,data| @buf << data }
         ch.on_extended_data { |ch,type,data|  @buf << data if type == 1 }
         ch.on_close { @eof = true }
 
         @channel = ch
         expect(default_prompt, &block)
         # this is a little bit unorthodox, we're trying to escape
         # the ssh loop there while still having the ssh connection up
         # otherwise we wouldn't be able to return ssh stdout/stderr
         # for a given call of command.
         return
       end
 
     end
     @ssh.loop
 
   end
 
   def close
     @channel.close if @channel
     @channel = nil
     @ssh.close if @ssh
   end
 
   def expect(prompt)
     line = ''
     sock = @ssh.transport.socket
 
     while not @eof
       break if line =~ prompt and @buf == ''
       break if sock.closed?
 
       IO::select([sock], [sock], nil, nil)
 
       process_ssh
 
       # at this point we have accumulated some data in @buf
       # or the channel has been closed
       if @buf != ""
         line += @buf.gsub(/\r\n/no, "\n")
         @buf = ''
         yield line if block_given?
       elsif @eof
         # channel has been closed
         break if line =~ prompt
         if line == ''
           line = nil
           yield nil if block_given?
         end
         break
       end
     end
-    Puppet.debug("ssh: expected #{line}")
+    # Puppet.debug("ssh: expected #{line}")
     line
   end
 
   def send(line)
-    Puppet.debug("ssh: send #{line}")
+    # Puppet.debug("ssh: send #{line}")
     @channel.send_data(line + "\n")
   end
 
   def process_ssh
     while @buf == "" and not eof?
       begin
         @channel.connection.process(0.1)
       rescue IOError
         @eof = true
       end
     end
   end
 end
diff --git a/lib/puppet/util/network_device/transport/telnet.rb b/lib/puppet/util/network_device/transport/telnet.rb
index 5c66f4bea..30a1e3d12 100644
--- a/lib/puppet/util/network_device/transport/telnet.rb
+++ b/lib/puppet/util/network_device/transport/telnet.rb
@@ -1,43 +1,43 @@
 require 'puppet/util/network_device'
 require 'puppet/util/network_device/transport'
 require 'puppet/util/network_device/transport/base'
 require 'net/telnet'
 
 class Puppet::Util::NetworkDevice::Transport::Telnet < Puppet::Util::NetworkDevice::Transport::Base
     def initialize
       super
     end
 
     def handles_login?
       false
     end
 
     def connect
       @telnet = Net::Telnet::new("Host" => host, "Port" => port || 23,
                                  "Timeout" => 10,
                                  "Prompt" => default_prompt)
     end
 
     def close
       @telnet.close if @telnet
       @telnet = nil
     end
 
     def expect(prompt)
       @telnet.waitfor(prompt) do |out|
         yield out if block_given?
       end
     end
 
     def command(cmd, options = {})
       send(cmd)
       expect(options[:prompt] || default_prompt) do |output|
         yield output if block_given?
       end
     end
 
     def send(line)
-      Puppet.debug("telnet: send #{line}")
+      # Puppet.debug("telnet: send #{line}")
       @telnet.puts(line)
     end
 end