Revert on DI part 2: remove more unused classes

Not over yet...