Remove performance degredation