simplify clean-up of space stage (#1460) #2725

Job	Run time
build	6m 22s
test_when_cache_present (0, 11, 675)	30m 18s
test_when_cache_missing	0s
test_when_cache_present (1, 11, 675)	30m 48s
test_when_cache_present (2, 11, 675)	30m 31s
test_when_cache_present (3, 11, 675)	35m 34s
test_when_cache_present (4, 11, 675)	30m 28s
test_when_cache_present (5, 11, 675)	32m 58s
test_when_cache_present (6, 11, 675)	28m 19s
test_when_cache_present (7, 11, 675)	34m 59s
test_when_cache_present (8, 11, 675)	29m 34s
test_when_cache_present (9, 11, 675)	41m 7s
test_when_cache_present (10, 11, 675)	31m 46s
test_when_cache_present (11, 11, 675)	18m 59s
save_test_times_when_cache_missing	0s
save_test_times_when_cache_present	13s
	6h 21m 56s

Provide feedback