Fix github urls and remove old dependencies

Change-Id: I35638052b80495fb29e7486dedeac76893e0ec74