Do this after we remove pouch, since there are some dependencies/extra libraries for that. We should also end the reliance on special branches for version and use publicly released versions, where possible.