Little more cleanup, stubbed out transaction support