Index: trunk/tools/czarplot.pl
===================================================================
--- trunk/tools/czarplot.pl	(revision 30953)
+++ trunk/tools/czarplot.pl	(revision 31886)
@@ -26,5 +26,4 @@
 my $rateInterval = undef;
 my $deriv = undef;
-my $showCleanup = undef;
 my $nebulous = undef;
 my $savingToFile = undef;
@@ -46,5 +45,4 @@
         "histogram|h" => \$histogram,
         "nebulous|n" => \$nebulous,
-        "cleanup|c" => \$showCleanup,
         "rate|r" => \$rate,
         "deriv|f" => \$deriv,
@@ -81,7 +79,4 @@
     $analysis = 0;
     print "* OPTIONAL: include analysis                -a                          (default=$analysis)\n";} 
-if (!$showCleanup) {
-    $showCleanup = 0;
-    print "* OPTIONAL: include cleanup in timeseries   -c                          (default=$showCleanup)\n";} 
 if (!$log) {
     $log = 0;
@@ -166,12 +161,15 @@
 }
 
-if ($rate) {
+if ($rate and !$timeSeries) {
 
-    # default to a rate histogram if time series not selected
-    if (!$timeSeries) {$histogram = 1;}
-    $plotter->createRatePlot($label, $stage, $begin, $end, $rateInterval, $histogram, $timeSeries);
+        $plotter->createRateHistogram($label, $stage, $begin, $end, $rateInterval);
+        exit;
+}
+
+if (!$histogram && !$nebulous) {
+    $plotter->createTimeSeries($label, $stage, $begin, $end, $timeSeries, $log, $rate);
     exit;
 }
-if (!$nebulous && $timeSeries) {$plotter->createTimeSeries($label, $stage, $begin, $end, $log, $showCleanup, $deriv);}
+
 if ($histogram) {$plotter->createHistogram($label, $begin, $end);}
 if ($nebulous && $timeSeries) {$plotter->plotStorageTimeSeries($begin, $end);}