diff --git a/.gitignore b/.gitignore
index bde0eb4..eb21fdb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ zuora-client.gemspec
 .idea
 
 ## PROJECT::SPECIFIC
+Gemfile.lock
diff --git a/Gemfile b/Gemfile
index 24f1936..3895415 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,13 +1,3 @@
 # A sample Gemfile
 source "http://rubygems.org"
-gem "mumboe-soap4r" , ">= 1.5.8"
-gem "json_pure", ">= 1.4.6"
-
-group :test do
-  gem "test-unit"
-end
-
-group :development do
-  gem "rake"
-  gem "jeweler"
-end
+gemspec
diff --git a/Gemfile.lock b/Gemfile.lock
deleted file mode 100644
index be3aa9c..0000000
--- a/Gemfile.lock
+++ /dev/null
@@ -1,62 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    addressable (2.3.5)
-    builder (3.2.2)
-    descendants_tracker (0.0.3)
-    faraday (0.9.0)
-      multipart-post (>= 1.2, < 3)
-    git (1.2.6)
-    github_api (0.11.2)
-      addressable (~> 2.3)
-      descendants_tracker (~> 0.0.1)
-      faraday (~> 0.8, < 0.10)
-      hashie (>= 1.2)
-      multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.0)
-      oauth2
-    hashie (2.0.5)
-    highline (1.6.20)
-    httpclient (2.3.4.1)
-    jeweler (2.0.1)
-      builder
-      bundler (>= 1.0)
-      git (>= 1.2.5)
-      github_api
-      highline (>= 1.6.15)
-      nokogiri (>= 1.5.10)
-      rake
-      rdoc
-    json (1.8.1)
-    json_pure (1.8.1)
-    jwt (0.1.11)
-      multi_json (>= 1.5)
-    mini_portile (0.5.2)
-    multi_json (1.8.4)
-    multi_xml (0.5.5)
-    multipart-post (2.0.0)
-    mumboe-soap4r (1.5.8.6)
-      httpclient (>= 2.1.1)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
-    oauth2 (0.9.3)
-      faraday (>= 0.8, < 0.10)
-      jwt (~> 0.1.8)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (~> 1.2)
-    rack (1.5.2)
-    rake (10.1.1)
-    rdoc (4.1.1)
-      json (~> 1.4)
-    test-unit (2.4.8)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  jeweler
-  json_pure (>= 1.4.6)
-  mumboe-soap4r (>= 1.5.8)
-  rake
-  test-unit
diff --git a/Rakefile b/Rakefile
index 90963e8..a6b999f 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,23 +1,8 @@
-require 'rubygems'
+require "bundler/gem_tasks"
+require 'bundler'
+Bundler.setup
 require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "active_zuora"
-    gem.summary = "Active Zuora"
-    gem.description = "A client for Zuora API"
-    gem.email = "andy.fleener@tstmedia.com"
-    gem.homepage = "http://github.com/tstmedia/active_zuora"
-    gem.authors = ["Andy Fleener", "Ed Lebert", "Nate Greene"]
-    gem.files = FileList["CHANGES", "active_zuora.gemspec", "Rakefile", "README", "VERSION", "custom_fields.yml",
-        "lib/**/*"]
-    gem.requirements = ["none"]
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
+require 'test-unit'
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
@@ -39,7 +24,5 @@ rescue LoadError
   end
 end
 
-task :test => :check_dependencies
-
 task :default => :test
 
diff --git a/active_zuora.gemspec b/active_zuora.gemspec
index c964071..df2afc1 100644
--- a/active_zuora.gemspec
+++ b/active_zuora.gemspec
@@ -65,26 +65,9 @@ Gem::Specification.new do |s|
   s.requirements = ["none"]
   s.rubygems_version = "2.4.6"
   s.summary = "Active Zuora"
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mumboe-soap4r>, [">= 1.5.8"])
-      s.add_runtime_dependency(%q<json_pure>, [">= 1.4.6"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-    else
-      s.add_dependency(%q<mumboe-soap4r>, [">= 1.5.8"])
-      s.add_dependency(%q<json_pure>, [">= 1.4.6"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<mumboe-soap4r>, [">= 1.5.8"])
-    s.add_dependency(%q<json_pure>, [">= 1.4.6"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-  end
+  s.add_dependency('soap4r-ng')
+  s.add_dependency('json_pure')
+  s.add_development_dependency('rake')
+  s.add_development_dependency('test-unit')
 end