Remove more hacks.