Clean up Noise macros