Further cleanup of tr_gss and usage for tids handling