refactor(di): cleanup to make dartanalyzer happy