Remove ugly hacks.