cleanup; use helpers for trash