cleanup trap now uses calldir