Remove performance bottleneck