big cleanup for roles