Remove magic values from EPNoise