DO NOT MERGE Remove unused dependancies

Change-Id: I84acfe8304efa2025b00a6fe09d92c422780f134
3 files changed