Brought the extra ID back, as well as the rm part to remove temp files