The obvious solution is to clean up the mess.

Yeah it takes effort to clean things up, but the current way is only helping the far-right and kicking the can down the road will only mean them to become even more powerful by the time they take the wheel.