Removed unecessary dependencies

Change-Id: I124831ab9fc285854ab0affc4c4565c23c7445fb