[960987] Cleanup