removed some slow hacks