diff --git a/lib/supportbee.rb b/lib/supportbee.rb
index cae7167..be0bcfd 100644
--- a/lib/supportbee.rb
+++ b/lib/supportbee.rb
@@ -3,6 +3,3 @@
 require 'openssl'
 require 'faraday'
 require 'json'
-
-OpenSSL::SSL.send :remove_const, :VERIFY_PEER
-OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE
diff --git a/lib/supportbee/client.rb b/lib/supportbee/client.rb
index 58c9d49..cbdd888 100644
--- a/lib/supportbee/client.rb
+++ b/lib/supportbee/client.rb
@@ -17,7 +17,9 @@ def initialize(options={})
       @conn = Faraday.new(:url => @host) do |faraday|
         faraday.params[:auth_token] = @auth_token
         faraday.request  :url_encoded             # form-encode POST params
-        faraday.response :logger                  # log requests to STDOUT
+        if options[:debug]
+          faraday.response :logger                  # log requests to STDOUT
+        end
         faraday.adapter  Faraday.default_adapter  # make requests with Net::HTTP
       end
     end