Finish removing txn stuff