cleanup, add duration and callers