Remove transaction handling in adapter