patches: moved swap_token_removal patch