Cleanup of variable swap exercise