Remove DI class and functional