Clean-up and update of dependencies

Change-Id: Iefc87a9a729dc4d9af04e54b5796dca34cf77e07