Image cleanup, part 2