Remove debugging hacks