Clean up dependencies

Change-Id: I289195a506b9ec0b83f289774feb9f1d20910d21