Dependency management clean up