Removed some hacks