Clean up temp files better