Cleanup dependencies

Change-Id: I777483dae5fb732666f37035193cefd7267c2f47