diff --git a/xorriso/drive_mgt.c b/xorriso/drive_mgt.c
index fba8dc25..3963bedb 100644
--- a/xorriso/drive_mgt.c
+++ b/xorriso/drive_mgt.c
@@ -800,7 +800,7 @@ int Xorriso_toc(struct XorrisO *xorriso, int flag)
  int track_count= 0, session_no, track_no, profile_no= -1, track_size;
  int last_track_start= 0, last_track_size= -1, num_data= 0, is_data= 0;
  int is_inout_drive= 0, drive_role, status, num_formats, emul_lba;
- int num_payload= 0, not_reconizable= 0;
+ int not_reconizable= 0;
  char profile_name[80],*respt,*devadr, *typetext= "";
  struct burn_toc_entry toc_entry;
  struct burn_drive_info *dinfo;
@@ -816,6 +816,9 @@ int Xorriso_toc(struct XorrisO *xorriso, int flag)
  int image_blocks= 0;
  char volume_id[33];
  struct burn_toc_entry next_toc_entry;
+/*
+ int num_payload= 0, num_wasted= 0, num_nondata= 0;
+*/
 
  ret= Xorriso_get_drive_handles(xorriso, &dinfo, &drive,
                                 "on attempt to print Table Of Content",
@@ -976,7 +979,9 @@ int Xorriso_toc(struct XorrisO *xorriso, int flag)
    if(!(flag&1))
      Xorriso_toc_line(xorriso, flag & 8);
    last_track_start= lba;
+/*
    num_payload= num_data= last_track_size= nwa;
+*/
    num_sessions= 1;
  } else {
    sessions= isoburn_toc_disc_get_sessions(disc, &num_sessions);
@@ -1043,8 +1048,10 @@ int Xorriso_toc(struct XorrisO *xorriso, int flag)
        } 
        if(!(flag&1))
          Xorriso_toc_line(xorriso, flag & 8);
+/*
        if(track_no>0)
          num_payload+= lba - last_track_start;
+*/
        last_track_start= lba;
        if((toc_entry.control&7)>=4) /* data track */
          is_data= 1;
@@ -1058,7 +1065,9 @@ int Xorriso_toc(struct XorrisO *xorriso, int flag)
        lba= burn_msf_to_lba(toc_entry.pmin, toc_entry.psec, toc_entry.pframe);
      }
      last_track_size= lba - last_track_start;
+/*
      num_payload+= last_track_size;
+*/
      if(is_data)
        num_data+= last_track_size;
    }
@@ -1066,8 +1075,6 @@ int Xorriso_toc(struct XorrisO *xorriso, int flag)
  if(xorriso->request_to_abort)
    {ret= 1; goto ex;}
 /*
- int num_wasted= 0, num_nondata= 0;
-
  num_wasted= lba - num_payload;
  num_nondata= lba - num_data;
 */
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index 1e9cf25f..d157c59b 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2011.07.10.112539"
+#define Xorriso_timestamP "2011.07.11.175609"