Address some of the dependency analysis work against repo to reduce defined dependencies not directly used

Address some of the dependency analysis work against repo to reduce defined dependencies not directly used #2225