diff --git a/Rakefile b/Rakefile
index 6a82265c6e8ad..7e739210c9e43 100644
--- a/Rakefile
+++ b/Rakefile
@@ -19,10 +19,10 @@ require 'rake_tasks/crazy_fun/main'
 require 'rake_tasks/selenium_rake/detonating_handler'
 require 'rake_tasks/selenium_rake/crazy_fun'
 
+# The CrazyFun builders - Most of these are either partially or fully obsolete
 require 'rake_tasks/crazy_fun/mappings/tasks'
 require 'rake_tasks/crazy_fun/mappings/javascript'
 require 'rake_tasks/crazy_fun/mappings/rake'
-require 'rake_tasks/crazy_fun/mappings/rename'
 require 'rake_tasks/crazy_fun/mappings/ruby'
 
 # Location of all new methods
@@ -36,8 +36,7 @@ require 'rake_tasks/selenium_rake/type_definitions_generator'
 require 'rake_tasks/rake/task'
 require 'rake_tasks/rake/dsl'
 
-# Require the migrated rake files, which need to be tidied up further
-# These are the final items mixed into the global NS
+# These are the final items mixed into the global NS, should be namespaced correctly
 require 'rake_tasks/bazel'
 require 'rake_tasks/copyright'
 require 'rake_tasks/python'
diff --git a/rake_tasks/crazy_fun/mappings/python.rb b/rake_tasks/crazy_fun/mappings/python.rb
index dd22d53aba65c..5df2bf0e394de 100644
--- a/rake_tasks/crazy_fun/mappings/python.rb
+++ b/rake_tasks/crazy_fun/mappings/python.rb
@@ -1,7 +1 @@
 require 'rake_tasks/selenium_rake/checks'
-
-module Python
-  def self.lib_dir
-     Dir.glob('build/lib*')[0] || 'build/lib'
-  end
-end
diff --git a/rake_tasks/crazy_fun/mappings/rename/add_dependencies.rb b/rake_tasks/crazy_fun/mappings/rename/add_dependencies.rb
deleted file mode 100644
index cb6fa7abf9990..0000000000000
--- a/rake_tasks/crazy_fun/mappings/rename/add_dependencies.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-module Rename
-  class AddDependencies < Tasks
-    def handle(fun, dir, args)
-      name = task_name(dir, args[:name])
-      task name => []
-      task = Rake::Task[name]
-      task.out = "build/#{dir}/#{args[:out]}"
-      add_dependencies(task, dir, args[:deps])
-      add_dependencies(task, dir, args[:srcs])
-    end
-  end
-end
diff --git a/rake_tasks/crazy_fun/mappings/rename/check_preconditions.rb b/rake_tasks/crazy_fun/mappings/rename/check_preconditions.rb
deleted file mode 100644
index 16359d5040f38..0000000000000
--- a/rake_tasks/crazy_fun/mappings/rename/check_preconditions.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-module Folder
-  class CheckPreconditions < Tasks
-    def handle(fun, dir, args)
-      raise StandardError, ":name must be set" if args[:name].nil?
-      raise StandardError, ":srcs or :deps must be set" if args[:srcs].nil? and args[:deps].nil?
-      raise StandardError, ":out must be set" if args[:out].nil?
-    end
-  end
-end
diff --git a/rake_tasks/crazy_fun/mappings/rename/export.rb b/rake_tasks/crazy_fun/mappings/rename/export.rb
deleted file mode 100644
index 786f12df8678c..0000000000000
--- a/rake_tasks/crazy_fun/mappings/rename/export.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-module Rename
-  class Export < Tasks
-    def handle(fun, dir, args)
-      name = task_name(dir, args[:name])
-      task = Rake::Task[name]
-
-      task name do
-        from = Rake::Task[args[:srcs].nil? ? args[:deps][0] : args[:srcs][0]]
-        from_out = from.out
-        while from_out == nil and from.prerequisites.size == 1 do
-          from = Rake::Task[from.prerequisites[0]]
-          from_out = from.out
-        end
-
-        to = Rake::Task[task].out
-        mkdir_p File.dirname(to)
-        cp_r from_out, to
-      end
-    end
-  end
-end
diff --git a/rake_tasks/crazy_fun/mappings/rename_mappings.rb b/rake_tasks/crazy_fun/mappings/rename_mappings.rb
deleted file mode 100644
index 6367d3a7d9945..0000000000000
--- a/rake_tasks/crazy_fun/mappings/rename_mappings.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require 'rake_tasks/crazy_fun/mappings/common'
-
-require_relative 'rename/add_dependencies'
-require_relative 'rename/check_preconditions'
-require_relative 'rename/export'
-
-class RenameMappings
-  def add_all(fun)
-    fun.add_mapping("rename", Rename::CheckPreconditions.new)
-    fun.add_mapping("rename", Rename::AddDependencies.new)
-    fun.add_mapping("rename", Rename::Export.new)
-  end
-end