Remove bottleneck making claims page unuseable