Update dependencies and tweak build process.
Tweak build process.
Cleanup