Clean up dependencies

Change-Id: Id9d1f85bf9c63001ea343b4f150f103debf33229