Removed temporary hacks