Removed DI and UOA references