[SwapManager] clean up and fix.