Our recent cleanups

[xyz-ips snippet=”Display-Image-Test-Florence”]