More GB core removal and reintroduce noise_