Remove dependencies

Change-Id: Iace6e25b19092e1458b348c67cf61ca673ff9c0d