Remove obsolete dependencies

Change-Id: Ib6c7d3e9e574bf549a15f0ce02856a7c4d37abad