Removed dependency on SAPI client
Fixed urls to API + license