Clean up temporary surface usage and remove used of .arc.