Work to remove http/https dependency