Dependency cleanups, removing unused.