Remove fix - performance bottleneck. Figure real fix.