Dependecies cleaned up

Change-Id: Ic38dda6c8a91e892bdc41bf474b515aa5bdc1ad1