Remove x flavor.
Bump version code.