cleanup after merge-rawtx