Remove transactions to improve performance
Merge branch 'remove_transactions'