*8746* Clean up roles leftovers from 2.4.x-style auth code