Starting over, clearing out and new swap
More cleanup