diff --git a/bin/builderd b/bin/builderd
deleted file mode 100644
index c8b6296..0000000
--- a/bin/builderd
+++ /dev/null
@@ -1,10 +0,0 @@
-# #!/usr/bin/env ruby
-# require "bundler/setup"
-# $LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
-#
-# require "pipeline"
-#
-# Pipeline.load_config(File.expand_path('../../config/pipeline.yml', __FILE__))
-# # Pipeline.daemon
-# # Pipeline.build_analyzer "ruby"
-# Pipeline.build_test_runner "ruby"
diff --git a/bin/client.rb b/bin/client.rb
index 370f77f..e4625a8 100644
--- a/bin/client.rb
+++ b/bin/client.rb
@@ -45,10 +45,6 @@ class PipelineClient
     send_msg("build-test-runner_#{track_slug}", 300)
   end
 
-  def release_latest(track_slug)
-    send_msg("release-analyzer_#{track_slug}", 3)
-  end
-
   def analyze(track_slug, exercise_slug, solution_slug, iteration_folder)
     send_msg("analyze_#{track_slug}|#{exercise_slug}|#{solution_slug}|#{iteration_folder}", 10000)
   end
diff --git a/bin/router b/bin/router
index ab6721d..cb3d667 100644
--- a/bin/router
+++ b/bin/router
@@ -1,122 +1,14 @@
-# #!/usr/bin/env ruby
-# require "bundler/setup"
-# $LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
-#
-# require "pipeline"
-#
-# context = ZMQ::Context.new
-# front_end_socket = context.socket(ZMQ::ROUTER)
-# front_end_socket.bind('tcp://*:5566')
-#
-# back_end_socket = context.socket(ZMQ::DEALER)
-# # back_end_socket = context.socket(ZMQ::ROUTER)
-# @back_end_socket = back_end_socket
-#
-#
-# status_socket = context.socket(ZMQ::SUB)
-# status_socket.setsockopt(ZMQ::SUBSCRIBE, "")
-# status_socket.bind('tcp://*:5555')
-#
-# poller = ZMQ::Poller.new
-# poller.register(back_end_socket, ZMQ::POLLIN)
-# poller.register(front_end_socket, ZMQ::POLLIN)
-# poller.register(status_socket, ZMQ::POLLIN)
-#
-# @workers = {}
-#
-# def active_workers
-#   active = []
-#   cut_off = Time.now.to_i - 2000
-#   puts "Cut off #{cut_off}"
-#   @workers.each do |k, worker|
-#     puts "worker: #{worker}"
-#     last_seen = worker[:last_seen]
-#     puts "last_seen #{last_seen}"
-#     active << worker if last_seen > cut_off
-#   end
-#   active
-# end
-#
-# def check_active
-#   puts "------------------------------"
-#   inactive = []
-#   cut_off = Time.now.to_i - 15
-#   puts "Cut off #{cut_off}"
-#   @workers.each do |k, worker|
-#     last_seen = worker[:last_seen]
-#     puts "last_seen #{last_seen}. #{last_seen} > #{cut_off} .. #{last_seen > cut_off}"
-#     worker[:active] = last_seen > cut_off
-#     unless worker[:active]
-#       inactive << worker
-#     end
-#     puts "------------------------------"
-#     puts worker
-#     puts "------------------------------"
-#   end
-#   inactive.each do |inactive_worker|
-#     puts inactive_worker
-#     address = inactive_worker[:status]["address"]
-#     puts "Unsub #{address}"
-#     @back_end_socket.disconnect(address)
-#   end
-# end
-#
-# loop do
-#   poll_result = poller.poll
-#   break if poll_result == -1
-#
-#   puts "POLL #{poll_result}"
-#
-#   readables = poller.readables
-#
-#   puts "readables #{poller.readables.size}"
-#   puts "writables #{poller.writables.size}"
-#   puts "workers #{@workers.size}"
-#
-#   continue if readables.empty?
-#
-#   in_flight = {}
-#
-#   readables.each do |readable|
-#     case readable
-#     when status_socket
-#       puts "..."
-#       msg = ""
-#       status_socket.recv_string(msg)
-#       status_message = JSON.parse(msg)
-#       address = status_message["address"]
-#       identity = status_message["identity"]
-#       @workers[identity] = { last_seen: Time.now.to_i, status: status_message }
-#       back_end_socket.connect(address)
-#       puts "STATUS: #{msg}"
-#       puts "in_flight: #{in_flight}"
-#       check_active
-#     when front_end_socket
-#       check_active
-#       workers = active_workers
-#       puts "WORKERS #{workers}"
-#       if workers.empty?
-#         puts "no workers"
-#         msg = []
-#         front_end_socket.recv_strings(msg)
-#         puts "Address #{msg.first} | #{msg}"
-#         reply = [msg.first, "", { status: :failed }.to_json]
-#         front_end_socket.send_strings(reply)
-#       else
-#         msg = []
-#         front_end_socket.recv_strings(msg)
-#         puts "Address #{msg.first} |  #{msg}"
-#         in_flight[msg.first] = msg
-#         result = back_end_socket.send_strings(msg, 1000)
-#         puts result
-#       end
-#     when back_end_socket
-#       msg = []
-#       back_end_socket.recv_strings(msg)
-#       puts "HERER!!!! #{msg}"
-#       front_end_socket.send_strings(msg)
-#     end
-#   end
-# end
-#
-# # ZMQ::Device.create(front_end_socket, back_end_socket)
+#!/usr/bin/env ruby
+require "bundler/setup"
+$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
+
+require "pipeline"
+
+context = ZMQ::Context.new
+router = Pipeline::Rpc::Router.new(context)
+
+Thread.new do
+  router.run_heartbeater
+end
+
+router.run_eventloop
diff --git a/bin/router2 b/bin/router2
deleted file mode 100644
index cb3d667..0000000
--- a/bin/router2
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-require "bundler/setup"
-$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
-
-require "pipeline"
-
-context = ZMQ::Context.new
-router = Pipeline::Rpc::Router.new(context)
-
-Thread.new do
-  router.run_heartbeater
-end
-
-router.run_eventloop
diff --git a/bin/test.rb b/bin/test.rb
deleted file mode 100644
index ee11d27..0000000
--- a/bin/test.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-# require 'rubygems'
-# require 'ffi-rzmq'
-#
-# context = ZMQ::Context.new 2
-#
-# req = context.socket(ZMQ::REQ)
-# puts req.bind('ipc://routing.ipc')
-#
-# sleep 2
-#
-# Thread.new do
-#   socket = context.socket(ZMQ::ROUTER)
-#   puts socket.setsockopt(ZMQ::IDENTITY, "foobar")
-#   puts socket.connect('ipc://routing.ipc')
-#
-#   sleep 2
-#
-#   loop do
-#     puts "waiting"
-#     socket.recv_string(message = '')
-#     puts "Received [#{message}]"
-#     socket.send_string("OK " + message)
-#   end
-#
-# end
-#
-# 10.times do |request|
-#   ss = "Hello #{request}"
-#   puts req.setsockopt(ZMQ::IDENTITY, "baz")
-#   req.send_string("foobar", ZMQ::SNDMORE)
-#   req.send_string("foobar", ZMQ::SNDMORE)
-#   req.send_string("foobar", ZMQ::SNDMORE)
-#   req.send_string("foobar", ZMQ::SNDMORE)
-#   req.send_string("", ZMQ::SNDMORE)
-#   req.send_string(ss)
-#   puts "Sending string [#{ss}]"
-#   req.recv_string(message = '')
-#   puts "Received reply #{request}[#{message}]"
-# end