cleanup LegacySwap
swap decryption path
#4706
Merged
LegacySwap
swap decryption path
#4706