Remove SIS + small improvement to search (lowering lookup count dramatically)