diff --git a/lib/a_b_smartly.rb b/lib/a_b_smartly.rb
index 6328eda..2ac57c8 100644
--- a/lib/a_b_smartly.rb
+++ b/lib/a_b_smartly.rb
@@ -14,16 +14,11 @@ class ABSmartly
                 :variable_parser, :scheduler, :context_event_logger,
                 :audience_deserializer, :client
 
-  def self.configure_client(&block)
-    @@init_http = block
-  end
-
   def self.create(config)
     ABSmartly.new(config)
   end
 
   def initialize(config)
-    @@init_http = nil
     @context_data_provider = config.context_data_provider
     @context_event_handler = config.context_event_handler
     @context_event_logger = config.context_event_logger
@@ -64,6 +59,7 @@ def create_context(config)
   end
 
   def create_context_with(config, data)
+    validate_params(config)
     Context.create(get_utc_format, config, data,
                    @context_data_provider, @context_event_handler, @context_event_logger, @variable_parser,
                    AudienceMatcher.new(@audience_deserializer))
diff --git a/lib/a_b_smartly_config.rb b/lib/a_b_smartly_config.rb
index 42a4034..9e04760 100644
--- a/lib/a_b_smartly_config.rb
+++ b/lib/a_b_smartly_config.rb
@@ -18,10 +18,6 @@ def context_event_handler=(context_event_handler)
     self
   end
 
-  def context_data_provide
-    @context_event_handler
-  end
-
   def variable_parser=(variable_parser)
     @variable_parser = variable_parser
     self
diff --git a/lib/absmartly.rb b/lib/absmartly.rb
index c2febb2..468ce29 100644
--- a/lib/absmartly.rb
+++ b/lib/absmartly.rb
@@ -8,8 +8,6 @@
 require_relative "context_config"
 
 module Absmartly
-  @@init_config = nil
-
   class Error < StandardError
   end
 
diff --git a/lib/client.rb b/lib/client.rb
index ea6ed7c..177ad11 100644
--- a/lib/client.rb
+++ b/lib/client.rb
@@ -13,7 +13,7 @@ def self.create(config, http_client = nil)
     Client.new(config, http_client || DefaultHttpClient.create(DefaultHttpClientConfig.create))
   end
 
-  def initialize(config = nil, http_client = nil)
+  def initialize(config, http_client = nil)
     endpoint = config.endpoint
     raise ArgumentError.new("Missing Endpoint configuration") if endpoint.nil? || endpoint.empty?
 
@@ -75,6 +75,6 @@ def close
   end
 
   def success?
-    @promise.success?
+    @promise&.success? || false
   end
 end