image2 / image API cleanup phase-1