Clean up Tx API