IMG-672 Clean up all image paths