cleanup, better tx-queue