Reduce Mario Spam

Partial solution - some still remains #532