Merge "dovetail: rewrite cleanup images process"