Replaced Custom Spring transaction manager with builtin TransactionTemplate