remove gid, add tomkap everywhere