Addresses dependency convergence, some minor cleanup