Remove dependency on sal-connector-api