Removed hacks for now