ref(core): Pre-beforeSendTransaction cleanup
#6135
Merged
beforeSendTransaction cleanup
#6135