remove accidental swaps