removing gss dependency