update and cleanup dependencies

Change-Id: I1a468027a32c56e599ac4597fcd7b413b019d949