Remove the swaps