Remove imageNumber field and references