Tweaked image clean up in upgrade130() to avoid possible errant deletions.