Remove uneeded dependencies

Change-Id: If1109bc46ce534c5625c436735d61a7d52a8f0e9