Index: trunk/ippMonitor/czartool/czarpoll.pl
===================================================================
--- trunk/ippMonitor/czartool/czarpoll.pl	(revision 33796)
+++ trunk/ippMonitor/czartool/czarpoll.pl	(revision 33800)
@@ -45,6 +45,4 @@
         "stack", 
         "diff", 
-        "magic", 
-        "magicDS", 
         "dist", 
         "pub");
Index: trunk/ippMonitor/czartool/czartool.pl
===================================================================
--- trunk/ippMonitor/czartool/czartool.pl	(revision 33796)
+++ trunk/ippMonitor/czartool/czartool.pl	(revision 33800)
@@ -32,5 +32,5 @@
 my @publishingLabels = undef;
 
-my @stages = ("chip", "cam", "fake", "warp", "stack", "diff", "magic", "magicDS", "dist", "pub"); 
+my @stages = ("chip", "cam", "fake", "warp", "stack", "diff", "dist", "pub"); 
 promptPoll();
 
@@ -156,9 +156,9 @@
     chomp($label);
 
-    printf("\n+----------------------------------------------------------------------------------------------------------------------------------------------+\n");
-    printf("|                                                         %32s                                                     |\n", $label);
-    printf("+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+\n");
-    printf("|   state    |    chip    |    cam     |    fake    |    warp    |   stack    |    diff    |   magic    |  destreak  |    dist    |   publish  |\n");
-    printf("+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+\n");
+    printf("\n+--------------------------------------------------------------------------------------------------------------------+\n");
+    printf("|                                            %32s                                        |\n", $label);
+    printf("+------------+------------+------------+------------+------------+------------+------------+------------+------------+\n");
+    printf("|   state    |    chip    |    cam     |    fake    |    warp    |   stack    |    diff    |    dist    |   publish  |\n");
+    printf("+------------+------------+------------+------------+------------+------------+------------+------------+------------+\n");
 
     my $state;
@@ -179,5 +179,5 @@
     }
 
-    printf("+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+\n");
+    printf("+------------+------------+------------+------------+------------+------------+------------+------------+------------+\n");
 
 }
@@ -191,9 +191,9 @@
     my ($state) = @_;
 #print time, $/;
-    printf("\n+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+\n");
-    printf("|                                                                                         %10s (any faults are shown in parentheses)                                                                 |\n", $state);
-    printf("+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------------+\n");
-    printf("| no  |              label               | distributing? |  publishing?  |    chip    |    cam     |    fake    |    warp    |   stack    |    diff    |   magic    |  destreak  |    dist    |   publish  |\n");
-    printf("+-----+----------------------------------+---------------+---------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+\n");
+    printf("\n+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+\n");
+    printf("|                                                                 %10s (any faults are shown in parentheses)                                                               |\n", $state);
+    printf("+-----+----------------------------------+---------------+---------------+------------+------------+------------+------------+------------+------------+------------+------------+\n");
+    printf("| no  |              label               | distributing? |  publishing?  |    chip    |    cam     |    fake    |    warp    |   stack    |    diff    |    dist    |   publish  |\n");
+    printf("+-----+----------------------------------+---------------+---------------+------------+------------+------------+------------+------------+------------+------------+------------+\n");
 
     my $stdsLabel;
@@ -232,5 +232,5 @@
     }
 
-    printf("+-----+----------------------------------+---------------+---------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+\n");
+    printf("+-----+----------------------------------+---------------+---------------+------------+------------+------------+------------+------------+------------+------------+------------+\n");
 
 }
Index: trunk/ippMonitor/czartool/czartool/CzarDb.pm
===================================================================
--- trunk/ippMonitor/czartool/czartool/CzarDb.pm	(revision 33796)
+++ trunk/ippMonitor/czartool/czartool/CzarDb.pm	(revision 33800)
@@ -16,6 +16,4 @@
         "stack", 
         "diff", 
-        "magic", 
-        "magicDS", 
         "dist", 
         "pub"); # TODO put elsewhere
Index: trunk/ippMonitor/czartool/czartool/DayMetrics.pm
===================================================================
--- trunk/ippMonitor/czartool/czartool/DayMetrics.pm	(revision 33796)
+++ trunk/ippMonitor/czartool/czartool/DayMetrics.pm	(revision 33800)
@@ -98,5 +98,5 @@
     my %labelTables;
 
-    my @stages = ("burntool", "chip", "cam", "fake", "warp", "stack", "diff", "magic", "magicDS", "dist");
+    my @stages = ("burntool", "chip", "cam", "fake", "warp", "stack", "diff", "dist");
 
 
Index: trunk/ippMonitor/czartool/roboczar.pl
===================================================================
--- trunk/ippMonitor/czartool/roboczar.pl	(revision 33796)
+++ trunk/ippMonitor/czartool/roboczar.pl	(revision 33800)
@@ -21,5 +21,5 @@
 my $czarDb = $config->getCzarDbInstance();
 
-my @stages = ("burntool", "chip", "cam", "fake", "warp", "stack", "diff", "magic", "magicDS", "dist"); # TODO get from Pantasks
+my @stages = ("burntool", "chip", "cam", "fake", "warp", "stack", "diff", "dist"); # TODO get from Pantasks
 
 my @interestedServers = $config->getRoboczarInterestedServers();
Index: trunk/ippMonitor/raw/czartool_labels.php
===================================================================
--- trunk/ippMonitor/raw/czartool_labels.php	(revision 33796)
+++ trunk/ippMonitor/raw/czartool_labels.php	(revision 33800)
@@ -35,6 +35,4 @@
         "stack",
         "diff",
-        "magic",
-        "magicDS",
         "dist", 
         "pub");
@@ -470,12 +468,4 @@
 
         $link = $defaultlink;
-        getStateAndFaults($db, $thisLabel, $selectedState, "magic", $str, $anyFaults);
-        createFormattedTableCell($anyFaults, $link, $str, $anyFaults, (!$isUpdate && !$distributing) ? "gray" : null);
-
-        $link = $defaultlink;
-        getStateAndFaults($db, $thisLabel, $selectedState, "magicDS", $str, $anyFaults);
-        createFormattedTableCell($anyFaults, $link, $str, $anyFaults, (!$isUpdate && !$distributing) ? "gray" : null);
-
-        $link = $defaultlink;
         getStateAndFaults($db, $thisLabel, $selectedState, "dist", $str, $anyFaults);
         createFormattedTableCell($anyFaults, $link, $str, $anyFaults, (!$isUpdate && !$distributing) ? "gray" : null);