- Remove check in tx_write
- Minor cleanup