cleanup dependencies

Change-Id: I83f8529dd88f58f1a369165ebb66ffa8cf6ab087