clean up roles a bit