Removing dependency on curl