diff --git a/recipes/recipe_modules/bot_update/resources/bot_update.py b/recipes/recipe_modules/bot_update/resources/bot_update.py
index 80636dd17..2d880764d 100755
--- a/recipes/recipe_modules/bot_update/resources/bot_update.py
+++ b/recipes/recipe_modules/bot_update/resources/bot_update.py
@@ -16,6 +16,7 @@ import optparse
 import os
 import pprint
 import re
+import shutil
 import subprocess
 import sys
 import tempfile
@@ -1142,7 +1143,16 @@ def checkout(options, git_slns, specs, revisions, step_text):
   properties['git_cache_epoch'] = cache_epoch
 
   usage = disk_usage()
-  # TODO(ukai): remove cleanup_dir if available disk space is small?
+  # successfully checked out. remove cleanup_dir to get free disk space.
+  if os.path.exists(cleanup_dir):
+    prev_usage = usage
+    print('Removing cleanup_dir %s' % cleanup_dir)
+    shutil.rmtree(cleanup_dir, ignore_errors=True)
+    usage = disk_usage()
+    print('Release %dGB (%d%%)' %
+          (prev_usage.used_disk_space_gb - usage.used_disk_space_gb,
+           prev_usage.percent_used - usage.percent_used))
+
   step_text = step_text + (' -> [%dGB/%dGB used (%d%%)]' % usage)
 
   # Tell recipes information such as root, got_revision, etc.