FIX: Cleanup on close