Cleanup
More cleanup
No need to pass the transaction settings to the receiver