cleanup dependencies

Change-Id: I8b57000706c3ef735dea3694d00641b7d12142a8