Re-org of common role, plus some cleanup