removed hacks