Build with latest sdk, and a bit of cleanup.