remove swaps etc.