clean up transaction stuff, at least as much as it can be for now