Removed unnecessary hacks