diff --git a/ChangeLog b/ChangeLog
index b0b8d908..68518f26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ CHANGES IN WAF 2.1.0
 * While the Waf file runs on Python 2 and 3, creating it requires version 3
 + Added wafcache
 + waf_unit_test: Added task in returned tuples, custom reports should be adapted
+~ Ensure ConfigurationContext.load and Context.load definitions are consistent and remove unused *k parameters
 - Remove waflib.Runner.PriorityTasks.appendleft
 - Remove waflib.Task.TaskBase
 - Remove the upper class of waflib.Task.Task (metaclass syntax)
diff --git a/TODO b/TODO
index 51704824..feffa2c6 100644
--- a/TODO
+++ b/TODO
@@ -2,7 +2,4 @@ Waf 2.1
 -------
 
 - Fix the circular imports ccroot<->c_config.py
-- Remove superfluous *k in ctx.load() and other unused parameters
-  Ensure conf.load() has the same interface as ctx.load()
-- Ordered_iter_dict in python 3.7
 - Change _add_task to add_task in Runner.py
diff --git a/waflib/Configure.py b/waflib/Configure.py
index f16d67b0..3a60df7d 100644
--- a/waflib/Configure.py
+++ b/waflib/Configure.py
@@ -226,7 +226,7 @@ class ConfigurationContext(Context.Context):
 			tmpenv = self.all_envs[key]
 			tmpenv.store(os.path.join(self.cachedir.abspath(), key + Build.CACHE_SUFFIX))
 
-	def load(self, tool_list, tooldir=None, funs=None, with_sys_path=True, cache=False):
+	def load(self, tool_list, **kw):
 		"""
 		Load Waf tools, which will be imported whenever a build is started.
 
@@ -236,7 +236,7 @@ class ConfigurationContext(Context.Context):
 		:type tooldir: list of string
 		:param funs: functions to execute from the waf tools
 		:type funs: list of string
-		:param cache: whether to prevent the tool from running twice
+		:param cache: whether to prevent the tool from running twice (false by default)
 		:type cache: bool
 		"""
 
diff --git a/waflib/Context.py b/waflib/Context.py
index 902eddb2..67e652e7 100755
--- a/waflib/Context.py
+++ b/waflib/Context.py
@@ -188,13 +188,14 @@ class Context(ctx):
 			Logs.free_logger(logger)
 			delattr(self, 'logger')
 
-	def load(self, tool_list, *k, **kw):
+	def load(self, tool_list, **kw):
 		"""
-		Loads a Waf tool as a module, and try calling the function named :py:const:`waflib.Context.Context.fun`
-		from it.  A ``tooldir`` argument may be provided as a list of module paths.
+		Loads a Waf tool as a module, and try calling the function named :py:const:`waflib.Context.Context.fun` from it.
 
 		:param tool_list: list of Waf tool names to load
 		:type tool_list: list of string or space-separated string
+		:param tooldir: paths for the imports
+		:type tooldir: list of string
 		"""
 		tools = Utils.to_list(tool_list)
 		path = Utils.to_list(kw.get('tooldir', ''))