Merge "Clean up transaction"