Cleaning up transaction node code
Merge branch 'transaction'