Revert on DI part 3: remove more unused classes

Not over yet...