Just about finished, some unused dependencies remain