Merge "Remove redundant image tagging"