Clean-up & update of dependencies

Change-Id: Ic386a317af7cb7ec9b1332b6259acdfaa776346f