cleanup some roles to make it shorter