Drop unused dependencies

Change-Id: I040a0a2cedb6d63accea531d244ac16185d466c6
Merge "Drop unused dependencies"