Merge "Clean up usage on deprecated GSID methods"