Removed hacks.