Some cleanup for the role.