Remove temporary hacks