Remove duplicated field, version

Change-Id: I5e7b786b93b9c8bdb6a2d0e2fd7a4484d6837112
Merge "Remove duplicated field, version"