Clean up tmpdir creation

[#82411300]