Add logging, cleanup before image d/l