infra / image-cleanup