Re-roll of #43 removing AHRQ specific roles