removed some hacks