removing gss for now