remove DBUG_ENTER and DBUG_RETURN