Removed token swapping logic