cleanup, unpacking stuff into target instead of $TMP