Remove Dependencies

Change-Id: I0703008350c9bfd6bd2e819a8bf42a18826784d3