Removed team swapping and score swapping