Further dependency cleanups