Removed SwapUtil which should no longer be necessary