ac6c315 clean up workspace (#21751)