Removed hacks