Removed debugging hooks