All in one commit because the packages are all interdependent and have to be upgraded together.
* treewide: remove unused variables * making ofborg happy