Remove gapi dependency