refactor(di): cleanup