cleanup dependencies

Change-Id: I20a84a22f54718cfc0686662fe083d7d740023a2