Remove elves; replace them all with MOP era puntable marmots. Complete with sound effects.
It’s the only way to be safe.