Triage and cleanup