Bump version to 3.1, drop phone build.
Fix style issue.