diff --git a/examples/config.yml b/examples/config.yml
index 8e6e2326..d5924ea2 100644
--- a/examples/config.yml
+++ b/examples/config.yml
@@ -5,9 +5,7 @@
---
:verbose: false
:concurrency: 10
-
-# Set timeout to 8 on Heroku, longer if you manage your own systems.
-:timeout: 30
+:timeout: 25
# Sidekiq will run this file through ERB when reading it so you can
# even put in dynamic logic, like a host-specific queue.
diff --git a/examples/sinkiq.rb b/examples/sinkiq.rb
deleted file mode 100644
index 028c5773..00000000
--- a/examples/sinkiq.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-# Make sure you have Sinatra installed, then start sidekiq with
-# ./bin/sidekiq -r ./examples/sinkiq.rb
-# Simply run Sinatra with
-# ruby examples/sinkiq.rb
-# and then browse to http://localhost:4567
-#
-require 'sinatra'
-require 'sidekiq'
-require 'redis'
-require 'sidekiq/api'
-
-$redis = Redis.new
-
-class SinatraWorker
- include Sidekiq::Worker
-
- def perform(msg="lulz you forgot a msg!")
- $redis.lpush("sinkiq-example-messages", msg)
- end
-end
-
-get '/' do
- stats = Sidekiq::Stats.new
- @failed = stats.failed
- @processed = stats.processed
- @messages = $redis.lrange('sinkiq-example-messages', 0, -1)
- erb :index
-end
-
-post '/msg' do
- SinatraWorker.perform_async params[:msg]
- redirect to('/')
-end
-
-__END__
-
-@@ layout
-
-
- Sinatra + Sidekiq
-
- <%= yield %>
-
-
-
-@@ index
- Sinatra + Sidekiq Example
- Failed: <%= @failed %>
- Processed: <%= @processed %>
-
-
-
- Refresh page
-
- Messages
- <% @messages.each do |msg| %>
- <%= msg %>
- <% end %>
diff --git a/examples/upstart/sidekiq.conf b/examples/upstart/sidekiq.conf
index 28eb0f7a..27664248 100644
--- a/examples/upstart/sidekiq.conf
+++ b/examples/upstart/sidekiq.conf
@@ -48,7 +48,7 @@ reload signal TSTP
# Upstart waits 5 seconds by default to kill the a process. Increase timeout to
# give sidekiq process enough time to exit.
-kill timeout 15
+kill timeout 30
instance $index
diff --git a/examples/web/Gemfile b/examples/web/Gemfile
deleted file mode 100644
index 4971813e..00000000
--- a/examples/web/Gemfile
+++ /dev/null
@@ -1,5 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'sidekiq', path: '../../'
-gem 'thin'
-gem 'pry'
diff --git a/examples/web/config.ru b/examples/web/config.ru
deleted file mode 100644
index 2c008b53..00000000
--- a/examples/web/config.ru
+++ /dev/null
@@ -1,14 +0,0 @@
-require 'sidekiq/web'
-require 'redis'
-
-$redis = Redis.new
-
-class SinatraWorker
- include Sidekiq::Worker
-
- def perform(msg="lulz you forgot a msg!")
- $redis.lpush("sinkiq-example-messages", msg)
- end
-end
-
-run Sidekiq::Web