refactor: get rid of unused expert role; use etc all the way