diff --git a/middleman/Rakefile b/middleman/Rakefile
index 3eb8b88d..8f25f891 100644
--- a/middleman/Rakefile
+++ b/middleman/Rakefile
@@ -1,6 +1,5 @@
 # coding:utf-8
 RAKE_ROOT = __FILE__
 
-require 'rubygems'
 GEM_NAME = "middleman"
 require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')
\ No newline at end of file
diff --git a/middleman/features/.gitkeep b/middleman/features/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman/features/support/env.rb b/middleman/features/support/env.rb
deleted file mode 100644
index 24373181..00000000
--- a/middleman/features/support/env.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-PROJECT_ROOT_PATH = File.dirname(File.dirname(File.dirname(__FILE__)))
-
-core_root = File.expand_path("../../../../middleman-core/lib/middleman-core", __FILE__)
-
-require core_root
-require File.join(core_root, "step_definitions") 
-require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman')
\ No newline at end of file
diff --git a/middleman/lib/middleman.rb b/middleman/lib/middleman.rb
index 8d795478..1efaa3d3 100644
--- a/middleman/lib/middleman.rb
+++ b/middleman/lib/middleman.rb
@@ -1,5 +1,6 @@
+# Depends on both libraries
 require "middleman-core"
 require "middleman-more"
 
 # Make the VERSION string available
-require "middleman-core/version"
+require "middleman-core/version"
\ No newline at end of file
diff --git a/middleman/middleman.gemspec b/middleman/middleman.gemspec
index 66b67102..de2c2ba0 100644
--- a/middleman/middleman.gemspec
+++ b/middleman/middleman.gemspec
@@ -14,8 +14,6 @@ Gem::Specification.new do |s|
   s.description = "A static site generator. Provides dozens of templating languages (Haml, Sass, Compass, Slim, CoffeeScript, and more). Makes minification, compression, cache busting, Yaml data (and more) an easy part of your development cycle."
 
   s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {fixtures,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
   s.add_dependency("middleman-core", Middleman::VERSION)