remove references to roles