Real cleanup of temp files

Fix Opps