Merge "Remove unnecessary version properties"