diff --git a/benchmarks/defined_types4/benchmarker.rb b/benchmarks/defined_types4/benchmarker.rb
deleted file mode 100644
index 5b0669291..000000000
--- a/benchmarks/defined_types4/benchmarker.rb
+++ /dev/null
@@ -1,73 +0,0 @@
-require 'erb'
-require 'ostruct'
-require 'fileutils'
-require 'json'
-
-class Benchmarker
-  include FileUtils
-
-  def initialize(target, size)
-    @target = target
-    @size = size
-  end
-
-  def setup
-    require 'puppet'
-    config = File.join(@target, 'puppet.conf')
-    Puppet.initialize_settings(['--config', config])
-  end
-
-  def run(args=nil)
-    env = Puppet.lookup(:environments).get('benchmarking')
-    node = Puppet::Node.new("testing", :environment => env)
-    Puppet::Resource::Catalog.indirection.find("testing", :use_node => node)
-  end
-
-  def generate
-    environment = File.join(@target, 'environments', 'benchmarking')
-    templates = File.join('benchmarks', 'defined_types4')
-
-    mkdir_p(File.join(environment, 'modules'))
-    mkdir_p(File.join(environment, 'manifests'))
-
-    render(File.join(templates, 'site.pp.erb'),
-           File.join(environment, 'manifests', 'site.pp'),
-           :size => @size)
-
-    @size.times do |i|
-      module_name = "module#{i}"
-      module_base = File.join(environment, 'modules', module_name)
-      manifests = File.join(module_base, 'manifests')
-
-      mkdir_p(manifests)
-
-      File.open(File.join(module_base, 'metadata.json'), 'w') do |f|
-        JSON.dump({
-          "types" => [],
-          "source" => "",
-          "author" => "Defined Types Benchmark Future Parser",
-          "license" => "Apache 2.0",
-          "version" => "1.0.0",
-          "description" => "Defined Types benchmark module #{i}",
-          "summary" => "Just this benchmark module, you know?",
-          "dependencies" => [],
-        }, f)
-      end
-
-      render(File.join(templates, 'module', 'testing.pp.erb'),
-             File.join(manifests, 'testing.pp'),
-             :name => module_name)
-    end
-
-    render(File.join(templates, 'puppet.conf.erb'),
-           File.join(@target, 'puppet.conf'),
-           :location => @target)
-  end
-
-  def render(erb_file, output_file, bindings)
-    site = ERB.new(File.read(erb_file))
-    File.open(output_file, 'w') do |fh|
-      fh.write(site.result(OpenStruct.new(bindings).instance_eval { binding }))
-    end
-  end
-end
diff --git a/benchmarks/defined_types4/description b/benchmarks/defined_types4/description
deleted file mode 100644
index a5365c934..000000000
--- a/benchmarks/defined_types4/description
+++ /dev/null
@@ -1,4 +0,0 @@
-Benchmark scenario: heavy use of defined types
-Benchmark target: catalog compilation
-Parser: Future
-
diff --git a/benchmarks/defined_types4/module/testing.pp.erb b/benchmarks/defined_types4/module/testing.pp.erb
deleted file mode 100644
index e723561d5..000000000
--- a/benchmarks/defined_types4/module/testing.pp.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-define <%= name %>::testing {
-  notify { "in <%= name %>: $title": }
-}
diff --git a/benchmarks/defined_types4/puppet.conf.erb b/benchmarks/defined_types4/puppet.conf.erb
deleted file mode 100644
index e0c5d8588..000000000
--- a/benchmarks/defined_types4/puppet.conf.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-confdir = <%= location %>
-vardir = <%= location %>
-environmentpath = <%= File.join(location, 'environments') %>
diff --git a/benchmarks/defined_types4/site.pp.erb b/benchmarks/defined_types4/site.pp.erb
deleted file mode 100644
index 338b635b2..000000000
--- a/benchmarks/defined_types4/site.pp.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<% size.times do |i| %>
-  module<%= i %>::testing { "first": }
-  module<%= i %>::testing{ "second": }
-<% end %>