More D8 role cleanup.