Remove gid in more places