Clean-up of TransactionsManager

Change-Id: Ibdfd3bf46fbad0024fdafc353d02c4832868f131