More dependency cleanups