Remove the hacks and fix corruption.