From: nicolasconnault <nicolasconnault>
Date: Thu, 2 Apr 2009 12:51:14 +0000 (+0000)
Subject: MDL-13501 Removing stats and visual reports from HEAD
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=4c2a9208723b3150ab17f9a4ecfd3d15c96de78c;p=moodle.git

MDL-13501 Removing stats and visual reports from HEAD
---

diff --git a/grade/report/stats/README.txt b/grade/report/stats/README.txt
deleted file mode 100644
index 0d0e1ce9bf..0000000000
--- a/grade/report/stats/README.txt
+++ /dev/null
@@ -1,104 +0,0 @@
- ____     __              __                ____                                      __
-/\  _`\  /\ \__          /\ \__            /\  _`\                                   /\ \__
-\ \,\L\_\\ \ ,_\     __  \ \ ,_\    ____   \ \ \L\ \      __   _____     ___    _ __ \ \ ,_\
- \/_\__ \ \ \ \/   /'__`\ \ \ \/   /',__\   \ \ ,  /    /'__`\/\ '__`\  / __`\ /\`'__\\ \ \/
-   /\ \L\ \\ \ \_ /\ \L\.\_\ \ \_ /\__, `\   \ \ \\ \  /\  __/\ \ \L\ \/\ \L\ \\ \ \/  \ \ \_
-   \ `\____\\ \__\\ \__/.\_\\ \__\\/\____/    \ \_\ \_\\ \____\\ \ ,__/\ \____/ \ \_\   \ \__\
-    \/_____/ \/__/ \/__/\/_/ \/__/ \/___/      \/_/\/ / \/____/ \ \ \/  \/___/   \/_/    \/__/
-                                                                 \ \_\
-                                                                  \/_/
-	                                  ,+7$$Z$ZO= 
-	                    :+$$Z$$ZOZZZOOOOOOOOD,:,,,
-	                 +Z$ZOOO8OO8OOOOOOOOO8+====~~:,
-	               7$ZOOOOZOZOOOOOOOOOO8+++++=~:,
-	            77$88OZ8MMDZZZOOOOOOOZ+?++==~:,
-	         77Z$$Z8MM8OZOZZZZOOOO8ONDN+=~:,
-	       I7$Z$NMOOOOOO$$$ZZOOOOOD8D8D8:,
-	    II7$7MDZOOZZZZOZ$$ZZ$OOZNDNDDDD8DO         ,IIII777I~ 
-	 7?$$ZOMOOZZZ777MMMMMMMMMMMDNDN8DDDD$$7,   =+++++???IIII7777$? 
-	   ,,,:Z==++===7NMMMND8DDDMMD8DDDDD777777:?=~~~~==+++???II777$$$, 
-	    ,:DM~~~~::,O8ND8OO8Z$$$$DDDDDD7IIIIII+~~~=?I77$$$$77IIII77$$Z+, 
-	      ,8,,,,   ONND$ZZ$$777DDDDNDO$77II??+++I7$ZZOOOOZZ$77IIII7$ZZZ:,
-	       M,::,   O$D888ZO$II77DDD88OZ$7IIIIIII7$ZOO8OOOOOZ$77III77$ZO=:
-	      =M,,,    ?+~~+I$$$ZI778D$I?+=$77IIIII7$ZOO++===~~~$$7IIII7$ZOO~: 
-	      OM,,,    I?==?I7$O8D777?+=:,,:77I?III7ZOO++=~:,,,,:77I?II7$ZOO=~,
-	      8MI::,   I?=+II7$O8??+=~:,    77I?II7$ZOO+=~,      ?7I??II$ZOO+~: 
-	      ~M=~~,   I?++II7ZOO+=~,       II?+?I7$ZOO=~,       ,II+?II7ZOO+~: 
-	       M::~:   I?++II7ZOO+=:,       II++?I7$ZOO=~,        II++II7ZOO+~: 
-	       M,:~:   I?++II7ZOO+=:        II++?II$ZOO=~,        I?++II7ZOO+=: 
-	       M=::,   I?++II7ZOO+=:        II++?II$ZOO=~,        I?++II7ZOO+=:
-	       MI:::   I?++?I7ZOO+=:        II++?II$ZOO=~,        I?=+II7ZOO+=: 
-	      ,M?:~:   I?++?I7$OO+=:        II+=?II$ZOO=~,        I?=+II7ZOO+=:
-	      =M=:~:   I?++?I7$OO+=:        II+=?II$ZOO=~,        I?=+II7ZOO+=:
-	       M,:~:   I?++?I7$OO+=:        II+=?II$ZOO=~,        I?=+II7ZOO+~: 
-	       M,:~:   I?++?I7$OO+=:        II+=?II$ZOO=~,        I?=+II7ZOO+~: 
-	       M,::,   I?++?I7$OO+=:        II+=?II$ZOO=~,        I?=+II7ZOO+~: 
-	         ,:,   I?++?I7$OO+=:        II+=?II$ZOO=~,        I?=+II7ZOO+~: 
-	          ,    IIII77$ZOO+=:        IIIII77$OOO=~,        IIII77$ZOO+~:
-	               77$$ZZZOOO+=:        77$$ZZZOOOO=~,        77$ZZZOOOO+~:
-	               $ZOOOOOOOO+=:        $$ZOOOOOOOO=~,        $ZOOOOOOOO+=:
-
-
-=== About Stats Report ===
-The stats report gradebook plug-in was developed as part of a Google Summer of Code 2008
-project The goal of the plug-in is to provide a framework for providing text based
-statistics for grades in a course. Several statistics such as Highest, Lowest, Mean,
-Median, Mode, Percent Pass and Standard Deviation are included and new statistics can be
-easily dropped in by developers.
-
-
-=== About Author ===
-This plug-in was oringal created by a computer science student named Daniel Servos as part of
-a Google Summer of Code 2008 project.
-
-==== Contact Information ====
-Name: Daniel Servos
-E-mail: dservos@lakeheadu.ca
-Blog: HackerDan.com
-
-
-=== Copyright ===
-Moodle - Modular Object-Oriented Dynamic Learning Environment
-http://moodle.org
-
-Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com
-
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU
-General Public License as published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
-even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-General Public License for more details:
-
-http://www.gnu.org/copyleft/gpl.html
-
-
-=== Version / Release ===
-This plug-in was developed for Moodle 2.0 dev.
-
-This is the first real release of this plug-in and should be considered an beta version in that it
-has not yet had a chance to be extensively tested by users in real life situations and may have
-unknown bugs or issues.
-
-Version: 1.0.0b
-
-
-=== Development Information ===
-==== Adding new Statistics ====
-To add a new statistic to the plug-in extend the abstract class stats (grade/report/stats/statistics/stats.php) and place you class in a file name stat_yournamehere.php in  grade/report/stats/statistics and it should be automatically loaded in to plug-in.
-
-==== Specification ====
-http://docs.moodle.org/en/Student_projects/Animated_grade_statistics_report
-
-==== TO DO =====
-* Back port to Moodle 1.9.x
-* Add more statistics.
-* Add more settings for the report.
-* Improve look.
-* Add help windows/html.
-* Add report defaults page.
-* Deal with outcomes better/at all.
-* Add export functionality to different formats.
-* Improve this readme file.
-* Improve documentation.
\ No newline at end of file
diff --git a/grade/report/stats/arrayview.php b/grade/report/stats/arrayview.php
deleted file mode 100755
index 0a7b5c2769..0000000000
--- a/grade/report/stats/arrayview.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.org                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-/**
- * Displays data from an array in the report/stats plugin.
- * Array's data is encoded in the data param using the
- * grade_report_stats::encode_array function.
- * TODO: Improve look.
- * @package gradebook
- */
-
-require_once '../../../config.php';
-
-// TODO: this file must be removed or completely rewritten before 2.0 get's released
-
-$rawdata = required_param('data'); // TODO: we can not display ANYTHING on moodle pages like this!!!
-$courseid = required_param('id', PARAM_INT);
-
-$data = explode('"', stripslashes(base64_decode(strtr($rawdata, '-_,', '+/='))));
-$context = get_context_instance(CONTEXT_COURSE, $courseid);
-
-require_login($courseid);
-require_capability('gradereport/stats:view', $context);
-
-foreach($data as $stat) {
-    echo format_text($stat, FORMAT_HTML) . '<br/>';
-}
-?>
diff --git a/grade/report/stats/db/access.php b/grade/report/stats/db/access.php
deleted file mode 100755
index f4fe096b3f..0000000000
--- a/grade/report/stats/db/access.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.org                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-$gradereport_stats_capabilities = array(
-    'gradereport/stats:view' => array(
-        'riskbitmask' => RISK_PERSONAL,
-        'captype' => 'read',
-        'contextlevel' => CONTEXT_COURSE,
-        'legacy' => array(
-            'teacher' => CAP_ALLOW,
-            'editingteacher' => CAP_ALLOW,
-            'admin' => CAP_ALLOW
-        )
-    ),
-    'gradereport/stats:stat:lowest' => array(
-        'riskbitmask' => RISK_PERSONAL,
-        'captype' => 'read',
-        'contextlevel' => CONTEXT_COURSE,
-        'legacy' => array(
-            'student' => CAP_ALLOW,
-            'teacher' => CAP_ALLOW,
-            'editingteacher' => CAP_ALLOW,
-            'admin' => CAP_ALLOW
-        )
-    ),
-    'gradereport/stats:stat:highest' => array(
-        'riskbitmask' => RISK_PERSONAL,
-        'captype' => 'read',
-        'contextlevel' => CONTEXT_COURSE,
-        'legacy' => array(
-            'student' => CAP_ALLOW,
-            'teacher' => CAP_ALLOW,
-            'editingteacher' => CAP_ALLOW,
-            'admin' => CAP_ALLOW
-        )
-    ),
-    'gradereport/stats:stat:passpercent' => array(
-        'riskbitmask' => RISK_PERSONAL,
-        'captype' => 'read',
-        'contextlevel' => CONTEXT_COURSE,
-        'legacy' => array(
-            'student' => CAP_ALLOW,
-            'teacher' => CAP_ALLOW,
-            'editingteacher' => CAP_ALLOW,
-            'admin' => CAP_ALLOW
-        )
-    ),
-    'gradereport/stats:stat:standarddeviation' => array(
-        'riskbitmask' => RISK_PERSONAL,
-        'captype' => 'read',
-        'contextlevel' => CONTEXT_COURSE,
-        'legacy' => array(
-            'student' => CAP_ALLOW,
-            'teacher' => CAP_ALLOW,
-            'editingteacher' => CAP_ALLOW,
-            'admin' => CAP_ALLOW
-        )
-    ),
-    'gradereport/stats:stat:mean' => array(
-        'riskbitmask' => RISK_PERSONAL,
-        'captype' => 'read',
-        'contextlevel' => CONTEXT_COURSE,
-        'legacy' => array(
-            'student' => CAP_ALLOW,
-            'teacher' => CAP_ALLOW,
-            'editingteacher' => CAP_ALLOW,
-            'admin' => CAP_ALLOW
-        )
-    ),
-    'gradereport/stats:stat:median' => array(
-        'riskbitmask' => RISK_PERSONAL,
-        'captype' => 'read',
-        'contextlevel' => CONTEXT_COURSE,
-        'legacy' => array(
-            'student' => CAP_ALLOW,
-            'teacher' => CAP_ALLOW,
-            'editingteacher' => CAP_ALLOW,
-            'admin' => CAP_ALLOW
-        )
-    ),
-    'gradereport/stats:stat:mode' => array(
-        'riskbitmask' => RISK_PERSONAL,
-        'captype' => 'read',
-        'contextlevel' => CONTEXT_COURSE,
-        'legacy' => array(
-            'student' => CAP_ALLOW,
-            'teacher' => CAP_ALLOW,
-            'editingteacher' => CAP_ALLOW,
-            'admin' => CAP_ALLOW
-        )
-    )
-);
-
-?>
diff --git a/grade/report/stats/index.php b/grade/report/stats/index.php
deleted file mode 100755
index 891c8422ae..0000000000
--- a/grade/report/stats/index.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.org                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-/**
- * Index page for the stats report plugin.
- * Based on the grader report plugin but
- * for text based statistics.
- * @package gradebook
- */
-
-require_once '../../../config.php';
-require_once $CFG->libdir.'/gradelib.php';
-require_once $CFG->dirroot.'/grade/lib.php';
-require_once $CFG->dirroot.'/grade/report/stats/lib.php';
-
-$courseid = required_param('id', PARAM_INT);
-$toggle = optional_param('toggle', NULL, PARAM_INT);
-$toggle_type = optional_param('toggle_type', 0, PARAM_ALPHANUM);
-
-/// basic access checks
-if (!$course = $DB->get_record('course', array('id' => $courseid))) {
-    print_error('nocourseid');
-}
-
-require_login($course);
-$context = get_context_instance(CONTEXT_COURSE, $course->id);
-require_capability('gradereport/stats:view', $context);
-
-/// get tracking object
-$gpr = new grade_plugin_return(array('type'=>'report', 'plugin'=>'stats', 'courseid'=>$courseid));
-
-/// last selected report session tracking
-if (!isset($USER->grade_last_report)) {
-    $USER->grade_last_report = array();
-}
-$USER->grade_last_report[$course->id] = 'stats';
-
-/// Build navigation
-$strgrades  = get_string('grades');
-$reportname = get_string('modulename', 'gradereport_stats');
-$navigation = grade_build_nav(__FILE__, $reportname, $courseid);
-
-/// Handle toggle change request
-if (!is_null($toggle) && !empty($toggle_type)) {
-    set_user_preferences(array('grade_report_statsshow'.$toggle_type => $toggle));
-}
-
-grade_regrade_final_grades($courseid);
-
-/// Get report object
-$report = new grade_report_stats($courseid, $gpr, $context);
-
-print_grade_page_head($courseid, 'report', 'stats', $reportname);
-
-/// Build report to output
-$report->load_users();
-$report->harvest_data();
-$report->report_data();
-$report->adapt_data();
-
-/// Print report
-echo $report->group_selector;
-echo '<div class="clearer"></div>';
-echo $report->get_toggles_html();
-echo '<div class="clearer"></div>';
-echo $report->html;
-
-/// Print footer
-print_footer($course);
-
-?>
diff --git a/grade/report/stats/lang/en_utf8/gradereport_stats.php b/grade/report/stats/lang/en_utf8/gradereport_stats.php
deleted file mode 100755
index c17214a515..0000000000
--- a/grade/report/stats/lang/en_utf8/gradereport_stats.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.org                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-$string['modulename'] = 'Stats report';
-$string['stats:view'] = 'View course stats report';
-$string['preferences'] = 'Stats report preferences';
-
-$string['moredata']='Stats Report: More Data';
-
-$string['range'] = 'Range';
-$string['overall'] = 'Course total';
-$string['num_grades'] = 'Grades';
-
-$string['showranges'] = 'Show ranges';
-$string['showgroups'] = 'Show groups';
-$string['shownumgrades'] = 'Show number of grades';
-$string['showinverted'] = 'Invert Table';
-$string['hideranges'] = 'Hide ranges';
-$string['hidegroups'] = 'Hide groups';
-$string['hidenumgrades'] = 'Hide number of grades';
-$string['hideinverted'] = 'Invert Table';
-
-$string['statsshow'] = 'Show';
-
-$string['statistic'] = 'Statistic';
-$string['highest'] = 'Highest';
-$string['lowest'] = 'Lowest';
-$string['median'] = 'Median';
-$string['average'] = 'Average';
-$string['mean'] = 'Mean';
-$string['mode'] = 'Mode';
-$string['standarddeviation'] = 'Standard Deviation';
-$string['pass_percent'] = 'Percent Pass';
-
-$string['stats:stat:lowest'] ='Show Lowest Statistic';
-$string['stats:stat:highest'] = 'Show Highest Statistic';
-$string['stats:stat:passpercent'] = 'Show Percent Pass Statistic';
-$string['stats:stat:standarddeviation'] = 'Show Standard Deviation Statistic';
-$string['stats:stat:mean'] = 'Show Mean Statistic';
-$string['stats:stat:median'] = 'Show Median Statistic';
-$string['stats:stat:mode'] = 'Show Mode Statistic';
-
-$string['prefgeneral'] = 'General';
-$string['prefshow']= 'Show/hide toggles';
-$string['prefcalc'] = 'Calculations';
-$string['prefstats'] = 'Statistics';
-
-$string['aggregationview'] = 'Aggregation view';
-$string['aggregationposition'] = 'Aggregation position';
-
-$string['showscaleitems'] = 'Show items using scale';
-$string['showvalueitems'] = 'Show items using value';
-
-$string['incompleasmin'] = 'Incomplete grades as min';
-$string['usehidden'] = 'Count hidden grades';
-$string['uselocked'] = 'Count locked grades';
-
-$string['printable'] = 'Printer Friendly Version';
-?>
diff --git a/grade/report/stats/lib.php b/grade/report/stats/lib.php
deleted file mode 100755
index 30abffd867..0000000000
--- a/grade/report/stats/lib.php
+++ /dev/null
@@ -1,559 +0,0 @@
- <?php
- ///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.org                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
- /**
-  * File in which the grade_report_stats class is defined.
-  * @package gradebook
-  */
-
-require_once($CFG->dirroot . '/grade/report/lib.php');
-require_once($CFG->libdir.'/tablelib.php');
-
-foreach (glob($CFG->dirroot . '/grade/report/stats/statistics/stat_*.php') as $filename) {
-   require_once($filename);
-}
-
-/**
- * Class providing the API for the stats report, including harvesters,
- * reports, and adaptor methods for turing grades in to statistics.
- * @uses grade_report
- * @package gradebook
- */
-class grade_report_stats extends grade_report {
-    /**
-     * Capability to view hidden items.
-     * @var bool $canviewhidden
-     */
-    private $canviewhidden;
-
-    /**
-     * Grade objects of users in the course
-     * @var array $grades
-     */
-    private $grades = array();
-
-    /**
-     * Array of users final grades affter filtered based on
-     * settings.
-     * @var array $finalgrades
-     */
-    private $finalgrades = array();
-
-    /**
-     * The value returned from each statistic.
-     * @var array $reportedstats
-     */
-    private $reportedstats = array();
-
-    /**
-     * The html of the report to output.
-     * @var string $html
-     */
-    public $html;
-
-    /**
-     * The table class used to make the html of the report.
-     * @var object $table
-     */
-     private $table;
-
-     /**
-      * Array of clases that extend stats witch have the logic to
-      * generate the statstics.
-      * @var array $stats
-      */
-     private static $stats = array();
-
-    /**
-     * Constructor. Initialises grade_tree, sets up group, baseurl
-     * and pbarurl.
-     * @param int $courseid the coures id for the report
-     * @param object $gpr grade plugin tracking object
-     * @context string $context
-     */
-    public function __construct($courseid, $gpr, $context) {
-        global $CFG;
-        parent::__construct($courseid, $gpr, $context, null);
-
-        $this->canviewhidden = has_capability('moodle/grade:viewhidden', get_context_instance(CONTEXT_COURSE, $this->course->id));
-
-        /// Set up urls
-        $this->baseurl = 'index.php?id=' . $this->courseid;
-        $this->pbarurl = 'index.php?id=' . $this->courseid;
-
-        /// Set the position of the aggregation categorie based on pref
-        $switch = $this->get_pref('statsaggregationposition');
-        if ($switch == '' && isset($CFG->grade_aggregationposition)) {
-            $switch = grade_get_setting($this->courseid, 'aggregationposition', $CFG->grade_aggregationposition);
-        }
-
-        /// Build grade tree
-        $this->gtree = new grade_tree($this->courseid, false, $switch);
-
-        $this->course->groupmode = 2;
-        /// Set up Groups
-        if ($this->get_pref('statsshowgroups') || is_null($this->get_pref('statsshowgroups'))) {
-            $this->setup_groups();
-        }
-
-        /// Load stats classes from ./statistics
-        $this->load_stats();
-    }
-
-    /**
-     * Load all the stats classes into $stats.
-     * Looks in /statistics and trys to make an instence of any
-     * class that is in a file that starts with stats_ and extends
-     * stats directly.
-     * @param bool $return if true return stats array, else store in $this->stats
-     * @returns array array of clases that extend stats
-     */
-    private function load_stats($return=false) {
-        global $CFG;
-
-        $stats = array();
-
-        foreach (glob($CFG->dirroot . '/grade/report/stats/statistics/stat_*.php') as $path) {
-            $filename = substr(basename($path, '.php'), 5);
-
-            if(class_exists($filename) && get_parent_class($class = new $filename) == 'stats' ) {
-                $stats[$filename] = $class;
-            }
-        }
-
-        if($return) {
-            return $stats;
-        } else {
-            grade_report_stats::$stats = $stats;
-        }
-    }
-
-    /**
-     * Returns the current stats being used in the report or if no stats are
-     * set, it returns the stats as whould be loaded by load_stats.
-     * @returns array array of classes that extend stats
-     */
-    public function get_stats() {
-        if(!isset(grade_report_stats::$stats) || is_null(grade_report_stats::$stats) || empty(grade_report_stats::$stats)) {
-            return grade_report_stats::load_stats(true);
-        } else {
-            return grade_report_stats::$stats;
-        }
-    }
-
-    /// Added to keep grade_report happy
-    public function process_data($data){}
-    public function process_action($target, $action){}
-
-    /**
-     * Based on load user function from grader report.
-     * Pulls out the userids of the users to be used in the stats.
-     * @return array array of user ids to use in stats
-     */
-    public function load_users() {
-        global $CFG, $DB;
-
-        $params = array();
-        list($usql, $gbr_params) = $DB->get_in_or_equal(explode(',', $this->gradebookroles), SQL_PARAMS_NAMED);
-
-        $sql = "SELECT u.id
-                FROM {user} u
-                    JOIN {role_assignments} ra ON u.id = ra.userid
-                    $this->groupsql
-                WHERE ra.roleid $usql
-                    $this->groupwheresql
-                    AND ra.contextid ".get_related_contexts_string($this->context);
-
-        $params = array_merge($gbr_params, $this->groupwheresql_params);
-
-        $this->users = $DB->get_records_sql($sql, $params);
-
-        if (empty($this->users)) {
-            $this->userselect = '';
-            $this->users = array();
-            $this->userselect_params = array();
-        } else {
-            list($usql, $params) = $DB->get_in_or_equal(array_keys($this->users));
-            $this->userselect = "AND g.userid $usql";
-            $this->userselect_params = $params;
-        }
-
-        return $this->users;
-    }
-
-    /**
-     * Encode an array of stat's data in to a stirng so it can
-     * be put in the get part of a url.
-     * @param arrray $array array of data to encode
-     * @param object $item grade_item to use to fromat stats
-     * @param object $stat stats object to use to format stats
-     * @return string encoded string
-     */
-    private function encode_array(array $array, $item, $stat) {
-        $string = '';
-
-        /// Encode each elment by puting a delimiter and base64 encoding it.
-        foreach($array as $id=>$data) {
-            $string .= addslashes(grade_format_gradevalue($data, $item, true, $stat->displaytype, $stat->decimals)) . '"';
-        }
-        return strtr(base64_encode($string), '+/=', '-_,');
-    }
-
-    /**
-     * Harvest the grades from the data base and build the finalgrades array.
-     * Filters out hidden, locked and null grades based on users settings.
-     * Partly based on grader reports load_final_grades function.
-     */
-    public function harvest_data() {
-        global $CFG, $DB;
-
-        $params = array();
-
-        $params = array_merge(array($this->courseid), $this->userselect_params);
-
-        /// please note that we must fetch all grade_grades fields if we want to contruct grade_grade object from it!
-        $sql = "SELECT g.*
-              FROM {grade_items} gi,
-                   {grade_grades} g
-             WHERE g.itemid = gi.id AND gi.courseid = ? {$this->userselect}";
-
-        $grades = $DB->get_records_sql($sql, $params);
-
-        $userids = array_keys($this->users);
-
-        if ($grades) {
-            foreach ($grades as $graderec) {
-                if (in_array($graderec->userid, $userids) and array_key_exists($graderec->itemid, $this->gtree->items)) { // some items may not be present!!
-                    $this->grades[$graderec->itemid][$graderec->userid] = new grade_grade($graderec, false);
-                    $this->grades[$graderec->itemid][$graderec->userid]->grade_item =& $this->gtree->items[$graderec->itemid]; // db caching
-                }
-            }
-        }
-
-        /// prefil grades that do not exist yet
-        foreach ($userids as $userid) {
-            foreach ($this->gtree->items as $itemid=>$unused) {
-                if (!isset($this->grades[$itemid][$userid])) {
-                    $this->grades[$itemid][$userid] = new grade_grade();
-                    $this->grades[$itemid][$userid]->itemid = $itemid;
-                    $this->grades[$itemid][$userid]->userid = $userid;
-                    $this->grades[$itemid][$userid]->grade_item =& $this->gtree->items[$itemid]; // db caching
-                }
-            }
-        }
-
-        $this->finalgrades = array();
-
-        /// Build finalgrades array and filliter out unwanted grades.
-        foreach ($this->gtree->items as $id=>$item) {
-            if(($item->gradetype == GRADE_TYPE_SCALE &&  ($this->get_pref('statsshowscaleitems') || is_null($this->get_pref('statsshowscaleitems'))))
-                || ($item->gradetype == GRADE_TYPE_VALUE &&  ($this->get_pref('statsshowvalueitems') || is_null($this->get_pref('statsshowvalueitems'))))) {
-                    $this->finalgrades[$id] = array();
-                    $i = 0;
-
-                    if(isset($this->grades[$id]) && !is_null($this->grades[$id])) {
-                        foreach ($this->grades[$id] as $grade) {
-                            if( (($grade->is_hidden() &&  $this->canviewhidden && ($this->get_pref('statsusehidden') || is_null($this->get_pref('statsusehidden')))) || !$grade->is_hidden())
-                                && (($grade->is_locked() && ($this->get_pref('statsuselocked') || is_null($this->get_pref('statsuselocked')))) || !$grade->is_locked())) {
-                                    if($this->get_pref('statsincompleasmin') && is_null($grade->finalgrade)) {
-                                        $this->finalgrades[$id][$i] = $item->grademin;
-                                        $i++;
-                                    } elseif(!is_null($grade->finalgrade)) {
-                                        $this->finalgrades[$id][$i] = $grade->finalgrade;
-                                        $i++;
-                                    }
-                            }
-                        }
-                    }
-                }
-        }
-    }
-
-    /**
-     * Runs grades for each item threw the report functions
-     * of each stats class in $stats and stores the values in
-     * reportedstats.
-     */
-    public function report_data() {
-        $this->reportedstats = array();
-
-        foreach(grade_report_stats::$stats as $name=>$stat) {
-            if(($stat->capability == null || has_capability($stat->capability, $this->context)) && ($this->get_pref('stats'. $name) || is_null($this->get_pref('stats'. $name)))) {
-                $this->reportedstats[$name] = array();
-
-                foreach($this->finalgrades as $itemid=>$item) {
-                    sort($item);
-                    if(count($item) > 0) {
-                        $this->reportedstats[$name][$itemid] = $stat->report_data($item, $this->gtree->items[$itemid]);
-                    } else {
-                        $this->reportedstats[$name][$itemid] = null;
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Take the reported data and adapt it in to HTML to output.
-     * HTML is stored in html.
-     * TODO: Deal with tables growing to wide.
-     * TODO: Make it look nice.
-     */
-    public function adapt_data($printerversion = false) {
-        global $CFG;
-
-        $inverted = $this->get_pref('statsshowinverted');
-
-        /// Set up table arrays
-        $tablecolumns = array('statistic');
-        $tableheaders = array($this->get_lang_string('statistic', 'gradereport_stats'));
-
-        /// Loop threw items and build arrays
-        if ($inverted) {
-            if($this->get_pref('statsshowranges')) {
-                array_push($tablecolumns, 'range');
-                array_push($tableheaders, $this->get_lang_string('range', 'gradereport_stats'));
-            }
-
-            foreach($this->reportedstats as $name=>$data) {
-                array_push($tablecolumns, $name);
-                array_push($tableheaders, grade_report_stats::$stats[$name]->name);
-            }
-
-            if($this->get_pref('statsshownumgrades')) {
-                array_push($tablecolumns, 'num_grades');
-                array_push($tableheaders, $this->get_lang_string('num_grades', 'gradereport_stats'));
-            }
-        } else {
-            /// Set up range column and number of grades column
-            $ranges = array(format_text('<strong>' . $this->get_lang_string('range', 'gradereport_stats') . '</strong>', FORMAT_HTML));
-            $numgrades = array(format_text('<strong>' . $this->get_lang_string('num_grades', 'gradereport_stats') . '</strong>', FORMAT_HTML));
-
-            foreach($this->finalgrades as $itemid=>$grades) {
-                array_push($tablecolumns, $itemid);
-                array_push($tableheaders,  format_text($this->gtree->items[$itemid]->get_name(), FORMAT_HTML));
-                array_push($ranges, format_text('<strong>' . grade_format_gradevalue($this->gtree->items[$itemid]->grademin, $this->gtree->items[$itemid], true) . '-' . grade_format_gradevalue($this->gtree->items[$itemid]->grademax, $this->gtree->items[$itemid], true) . '</strong>' , FORMAT_HTML));
-                array_push($numgrades, format_text(count($grades), FORMAT_HTML));
-            }
-        }
-
-        /// Set up flexible table
-        $this->table = new flexible_table('grade-report-stats-' . $this->courseid);
-        $this->table->define_columns($tablecolumns);
-        $this->table->define_headers($tableheaders);
-       if ($printerversion) {
-            $this->table->collapsible(false);
-            $this->table->set_attribute('cellspacing', '1');
-            $this->table->set_attribute('border', '1');
-        } else {
-            $this->table->define_baseurl($this->baseurl);
-            $this->table->collapsible(true);
-            $this->table->set_attribute('cellspacing', '1');
-            $this->table->set_attribute('id', 'stats-grade');
-            $this->table->set_attribute('class', 'grade-report-stats gradestable flexible');
-        }
-        $this->table->setup();
-
-        /// If ranges are being shown add them to the table
-        if(!$inverted){
-            if ($this->get_pref('statsshowranges')){
-                $this->table->add_data($ranges);
-                $this->table->add_separator();
-            }
-        }
-
-        /// Loop threw all the reported data and format it in to cells
-        /// If stat retured an array of values display the elements or
-        /// make a link to a popup with the data in it.
-        if($inverted) {
-            foreach($this->finalgrades as $itemid=>$grades) {
-                $item = $this->gtree->items[$itemid];
-                $row = array(format_text('<strong>' . $item->get_name() . '</strong>' , FORMAT_HTML));
-
-                if($this->get_pref('statsshowranges')) {
-                    array_push($row, format_text('<strong>' . grade_format_gradevalue($item->grademin, $item, true) . '-' . grade_format_gradevalue($item->grademax, $item, true) . '</strong>' , FORMAT_HTML));
-                }
-
-                foreach($this->reportedstats as $name=>$data) {
-                    $stat = $data[$itemid];
-
-                    if(!is_array($stat)) {
-                        array_push($row, format_text(grade_format_gradevalue($stat, $item, true, grade_report_stats::$stats[$name]->displaytype, grade_report_stats::$stats[$name]->decimals), FORMAT_HTML));
-                    } else {
-                        $statstring = "";
-
-                        for($i = 0; $i < 2; $i++) {
-                            if($i >= count($stat)) {
-                                break;
-                            }
-                            $statstring .= grade_format_gradevalue($stat[$i], $item, true, grade_report_stats::$stats[$name]->displaytype, grade_report_stats::$stats[$name]->decimals) . ', ';
-                        }
-
-                        if($i < count($stat)) {
-                            if(!$printerversion) {
-                                $statstring = "<a href=\"#\" onClick=\"javascript:window.open('{$CFG->wwwroot}/grade/report/stats/arrayview.php?id={$this->courseid}&data={$this->encode_array($stat, $item, grade_report_stats::$stats[$name])}','{$this->get_lang_string('moredata', 'gradereport_stats')}','width=300,height=500,menubar=no,status=no,location=no,directories=no,toolbar=no,scrollbars=yes');\">". format_text($statstring, FORMAT_HTML) . '....</a>';
-                            } else {
-                                    $statstring .= '...';
-                            }
-                        } else {
-                            $statstring = substr($statstring, 0, strlen($statstring) - 2);
-                        }
-                        array_push($row, $statstring);
-                    }
-                }
-
-                if($this->get_pref('statsshownumgrades')) {
-                    array_push($row, format_text(count($grades), FORMAT_HTML));
-                }
-
-                $this->table->add_data($row);
-            }
-        } else {
-            foreach($this->reportedstats as $name=>$data) {
-                $row = array(format_text('<strong>' . grade_report_stats::$stats[$name]->name . '</strong>', FORMAT_HTML));
-
-                foreach($data as $itemid=>$stat) {
-                    if(!is_array($stat)) {
-                        array_push($row, format_text(grade_format_gradevalue($stat, $this->gtree->items[$itemid], true, grade_report_stats::$stats[$name]->displaytype, grade_report_stats::$stats[$name]->decimals), FORMAT_HTML));
-                    } else {
-                        $statstring = "";
-
-                        for($i = 0; $i < 2; $i++) {
-                            if($i >= count($stat)) {
-                                break;
-                            }
-                            $statstring .= grade_format_gradevalue($stat[$i], $this->gtree->items[$itemid], true, grade_report_stats::$stats[$name]->displaytype, grade_report_stats::$stats[$name]->decimals) . ', ';
-                        }
-
-                        if($i < count($stat)) {
-                            if(!$printerversion) {
-                                $statstring = "<a href=\"#\" onClick=\"javascript:window.open('{$CFG->wwwroot}/grade/report/stats/arrayview.php?id={$this->courseid}&data={$this->encode_array($stat, $this->gtree->items[$itemid], grade_report_stats::$stats[$name])}','{$this->get_lang_string('moredata', 'gradereport_stats')}','width=300,height=500,menubar=no,status=no,location=no,directories=no,toolbar=no,scrollbars=yes');\">". format_text($statstring, FORMAT_HTML) . '....</a>';
-                            } else {
-                                    $statstring .= '...';
-                            }
-                        } else {
-                            $statstring = substr($statstring, 0, strlen($statstring) - 2);
-                        }
-                        array_push($row, $statstring);
-                    }
-                }
-                $this->table->add_data($row);
-            }
-        }
-
-        /// If the number of grades is being shown add it to the table.
-        if(!$inverted) {
-            if ($this->get_pref('statsshownumgrades')){
-                $this->table->add_separator();
-                $this->table->add_data($numgrades);
-            }
-        }
-
-        /// Build html
-        ob_start();
-            if($this->currentgroup == 0) {
-                echo format_text('<strong>Group:</strong> All participants', FORMAT_HTML);
-            } else {
-                echo format_text('<strong>Group:</strong> ' . groups_get_group_name($this->currentgroup), FORMAT_HTML);
-            }
-            $this->table->print_html();
-        $this->html = ob_get_clean();
-    }
-
-    /**
-     * Builds HTML for toggles on top of report.
-     * Based on grader report  get_toggles_html
-     * @return string html code for toggles.
-     */
-    public function get_toggles_html() {
-        global $CFG, $USER;
-
-        $html = '<div id="stats-report-toggles" style="vertical-align: text-top; text-align: center;">';
-        $html .= $this->print_toggle('numgrades', true);
-        $html .= $this->print_toggle('groups', true);
-        $html .= $this->print_toggle('ranges', true);
-        $html .= $this->print_toggle('inverted', true);
-        $html .= '</div>';
-
-        return $html;
-    }
-
-    /**
-     * Builds HTML for each individual toggle.
-     * Based on grader report print_toggle
-     * @param string $type The toggle type.
-     * @param bool $return Wheather ro return the HTML or print it.
-     */
-    private function print_toggle($type, $return=false) {
-        global $CFG;
-
-        $icons = array('eyecons' => 't/hide.gif',
-                       'numgrades' => 't/grades.gif',
-                       'calculations' => 't/calc.gif',
-                       'locks' => 't/lock.gif',
-                       'averages' => 't/mean.gif',
-                       'inverted' => 't/switch_whole.gif',
-                       'nooutcomes' => 't/outcomes.gif');
-
-        $pref_name = 'grade_report_statsshow' . $type;
-
-        if (array_key_exists($pref_name, $CFG)) {
-            $show_pref = get_user_preferences($pref_name, $CFG->$pref_name);
-        } else {
-            $show_pref = get_user_preferences($pref_name);
-        }
-
-        $strshow = $this->get_lang_string('show' . $type, 'gradereport_stats');
-        $strhide = $this->get_lang_string('hide' . $type, 'gradereport_stats');
-
-        $show_hide = 'show';
-        $toggle_action = 1;
-
-        if ($show_pref) {
-            $show_hide = 'hide';
-            $toggle_action = 0;
-        }
-
-        if (array_key_exists($type, $icons)) {
-            $image_name = $icons[$type];
-        } else {
-            $image_name = "t/$type.gif";
-        }
-
-        $string = ${'str' . $show_hide};
-
-        $img = '<img src="'.$CFG->pixpath.'/'.$image_name.'" class="iconsmall" alt="'
-                      .$string.'" title="'.$string.'" />'. "\n";
-
-        $retval = $img . '<a href="' . $this->baseurl . "&amp;toggle=$toggle_action&amp;toggle_type=$type\">"
-             . format_text($string, FORMAT_HTML) . '</a> ';
-
-        if ($return) {
-            return $retval;
-        } else {
-            echo $retval;
-        }
-    }
-}
-?>
diff --git a/grade/report/stats/preferences.php b/grade/report/stats/preferences.php
deleted file mode 100755
index 75b692ca39..0000000000
--- a/grade/report/stats/preferences.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.org                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-/**
- * Preferences page for the stats report plugin.
- * Based on the grader report plugin.
- * @package gradebook
- */
-
-require_once '../../../config.php';
-require_once $CFG->libdir . '/gradelib.php';
-require_once $CFG->dirroot.'/grade/lib.php';
-
-$courseid = required_param('id', PARAM_INT);
-
-
-/// Make sure they can even access this course
-if (!$course = $DB->get_record('course', array('id' => $courseid))) {
-    print_error('nocourseid');
-}
-
-require_login($course);
-
-$context = get_context_instance(CONTEXT_COURSE, $course->id);
-$systemcontext = get_context_instance(CONTEXT_SYSTEM);
-require_capability('gradereport/stats:view', $context);
-
-
-require('preferences_form.php');
-$mform = new stats_report_preferences_form('preferences.php', compact('course'));
-
-// If data submitted, then process and store.
-if ($data = $mform->get_data()) {
-    foreach ($data as $preference => $value) {
-        if (substr($preference, 0, 18) !== 'grade_report_stats') {
-            continue;
-        }
-
-        if ($value == GRADE_REPORT_PREFERENCE_DEFAULT || strlen($value) == 0) {
-            unset_user_preference($preference);
-        } else {
-            set_user_preference($preference, $value);
-        }
-    }
-}
-
-/// If cancelled go back to report
-if ($mform->is_cancelled()){
-    redirect($CFG->wwwroot . '/grade/report/stats/index.php?id='.$courseid);
-}
-
-print_grade_page_head($courseid, 'preferences', 'stats', get_string('preferences', 'gradereport_stats'));
-
-/// If USER has admin capability, print a link to the site config page for this report
-/// TODO: Add admin config page for this report
-if (has_capability('moodle/site:config', $systemcontext)) {
-    echo '<div id="siteconfiglink"><a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/settings.php?section=gradereportstats">';
-    echo get_string('changereportdefaults', 'grades');
-    echo "</a></div>\n";
-}
-
-print_simple_box_start("center");
-
-$mform->display();
-print_simple_box_end();
-
-print_footer($course);
-?>
diff --git a/grade/report/stats/preferences_form.php b/grade/report/stats/preferences_form.php
deleted file mode 100755
index eff26cba56..0000000000
--- a/grade/report/stats/preferences_form.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.org                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-/**
- * FIle with class defition for stats_report_preferences_form.
- * Used by preferences.php
- * @package gradebook
- */
-
-require_once($CFG->libdir.'/formslib.php');
-require_once($CFG->dirroot . '/grade/report/stats/lib.php');
-
-/**
- * Moodle form to be used to set user preferences for report/stats
- * gradebook plugin.
- * @uses moodleform
- */
-class stats_report_preferences_form extends moodleform {
-
-    /**
-     * Fourm definition.
-     */
-    public function definition() {
-        global $USER, $CFG;
-
-        $stats = grade_report_stats::get_stats();
-
-        $mform    =& $this->_form;
-        $course   = $this->_customdata['course'];
-
-        $context = get_context_instance(CONTEXT_COURSE, $course->id);
-        $systemcontext = get_context_instance(CONTEXT_SYSTEM);
-        $stryes                 = get_string('yes');
-        $strno                  = get_string('no');
-
-        $checkbox_default = array(GRADE_REPORT_PREFERENCE_DEFAULT => '*default*', 0 => $strno, 1 => $stryes);
-
-        $advanced = array();
-        $preferences = array();
-
-        $preferences['prefgeneral'] = array(
-                          /*  'aggregationview'     => array(GRADE_REPORT_PREFERENCE_DEFAULT => '*default*',
-                                                         GRADE_REPORT_AGGREGATION_VIEW_FULL => get_string('fullmode', 'grades'),
-                                                         GRADE_REPORT_AGGREGATION_VIEW_AGGREGATES_ONLY => get_string('aggregatesonly', 'grades'),
-                                                         GRADE_REPORT_AGGREGATION_VIEW_GRADES_ONLY => get_string('gradesonly', 'grades')
-                            ),*/
-
-                            'aggregationposition' => array(GRADE_REPORT_PREFERENCE_DEFAULT => '*default*',
-                                                                       GRADE_REPORT_AGGREGATION_POSITION_FIRST => get_string('positionfirst', 'grades'),
-                                                                       GRADE_REPORT_AGGREGATION_POSITION_LAST => get_string('positionlast', 'grades')
-                            )
-        );
-        $preferences['prefstats'] = array();
-        $preferences['prefshow'] = array();
-
-        foreach($stats as $key=>$stat) {
-            $preferences['prefstats'][$key] = $checkbox_default;
-        }
-
-        $preferences['prefshow']['showgroups'] = $checkbox_default;
-        $preferences['prefshow']['showranges'] = $checkbox_default;
-        $preferences['prefshow']['shownumgrades'] = $checkbox_default;
-        $preferences['prefshow']['showscaleitems'] = $checkbox_default;
-        $preferences['prefshow']['showvalueitems'] = $checkbox_default;
-        $preferences['prefshow']['showinverted'] = $checkbox_default;
-
-        $preferences['prefcalc']['incompleasmin']  = $checkbox_default;
-        $preferences['prefcalc']['usehidden']  = $checkbox_default;
-        $preferences['prefcalc']['uselocked']  = $checkbox_default;
-
-        foreach ($preferences as $group => $prefs) {
-            $mform->addElement('header', $group, get_string($group, 'gradereport_stats'));
-
-            foreach ($prefs as $pref => $type) {
-                $full_pref  = 'grade_report_stats' . $pref;
-                $pref_value = get_user_preferences($full_pref);
-	            $course_value = null;
-                //$options = $type;
-                //$type = 'select';
-
-                if (!empty($CFG->{$full_pref})) {
-                    $course_value = grade_get_setting($course->id, $pref, $CFG->{$full_pref});
-                }
-
-                $options = null;
-                if (is_array($type)) {
-                    $options = $type;
-                    $type = 'select';
-                    // MDL-11478
-                    // get default aggregationposition from grade_settings
-                    if (!empty($CFG->{$full_pref})) {
-                        $course_value = grade_get_setting($course->id, $pref, $CFG->{$full_pref});
-                    }
-
-                    if ($pref == 'aggregationposition') {
-                        if (!empty($options[$course_value])) {
-                            $default = $options[$course_value];
-                        } else {
-                            $default = $options[$CFG->grade_aggregationposition];
-                        }
-                    } elseif (isset($options[$CFG->{$full_pref}])) {
-                        $default = $options[$CFG->{$full_pref}];
-                    } else {
-                        $default = '';
-                    }
-                } else {
-                    $default = $CFG->$full_pref;
-                }
-                /*
-                if ($pref == 'aggregationposition') {
-                    if (!empty($options[$course_value])) {
-                        $default = $options[$course_value];
-                    } elseif(isset($CFG->grade_aggregationposition)) {
-                        $default = $options[$CFG->grade_aggregationposition];
-                    }
-                } elseif ($pref == 'aggregationview' && isset($CFG->grade_report_aggregationview) && isset($options[$CFG->grade_report_aggregationview])) {
-                    $default = $options[$CFG->grade_report_aggregationview];
-                } else {
-                    if (!empty($options[$course_value])) {
-                        $default = $options[$course_value];
-                    } else {
-                        if ($pref == 'incompleasmin') {
-                            $default = $strno;
-                        } else {
-                            $default = $stryes;
-                        }
-                    }
-                }*/
-
-                $help_string = get_string("config$pref", 'gradereport_stats');
-
-                // Replace the '*default*' value with the site default language string - 'default' might collide with custom language packs
-                if (!is_null($options) AND isset($options[GRADE_REPORT_PREFERENCE_DEFAULT]) && $options[GRADE_REPORT_PREFERENCE_DEFAULT] == '*default*') {
-                    $options[GRADE_REPORT_PREFERENCE_DEFAULT] = get_string('reportdefault', 'grades', $default);
-                } elseif ($type == 'text') {
-                    $help_string = get_string("config{$pref}default", 'gradereport_stats', $default);
-                }
-
-                if($group == 'prefstats') {
-                    $label = get_string('statsshow', 'gradereport_stats') . ' ' . $stats[$pref]->name;
-                } else {
-                    $label = get_string($pref, 'gradereport_stats');
-                }
-
-                $mform->addElement($type, $full_pref, $label, $options);
-                $mform->setHelpButton($full_pref, array('stats' . $pref, get_string($pref, 'gradereport_stats'), 'grade'), true);
-                $mform->setDefault($full_pref, $pref_value);
-                $mform->setType($full_pref, PARAM_ALPHANUM);
-            }
-        }
-
-        $mform->addElement('hidden', 'id');
-        $mform->setType('id', PARAM_INT);
-        $mform->setDefault('id', $course->id);
-
-        $this->add_action_buttons();
-    }
-}
-
-?>
diff --git a/grade/report/stats/print.php b/grade/report/stats/print.php
deleted file mode 100644
index 4fd119e608..0000000000
--- a/grade/report/stats/print.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.org                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-/**
- * Printer page for the stats report plugin.
- * @package gradebook
- */
-
-require_once '../../../config.php';
-require_once $CFG->libdir.'/gradelib.php';
-require_once $CFG->dirroot.'/grade/lib.php';
-require_once $CFG->dirroot.'/grade/report/stats/lib.php';
-
-$courseid = required_param('id', PARAM_INT);
-
-$reportname = get_string('modulename', 'gradereport_stats');
-
-/// basic access checks
-if (!$course = $DB->get_record('course', array('id' => $courseid))) {
-    print_error('nocourseid');
-}
-require_login($course);
-$context = get_context_instance(CONTEXT_COURSE, $course->id);
-require_capability('gradereport/stats:view', $context);
-
-/// get tracking object
-$gpr = new grade_plugin_return(array('type'=>'report', 'plugin'=>'stats', 'courseid'=>$courseid));
-
-/// last selected report session tracking
-if (!isset($USER->grade_last_report)) {
-    $USER->grade_last_report = array();
-}
-$USER->grade_last_report[$course->id] = 'stats';
-
-grade_regrade_final_grades($courseid);
-
-/// Get report object
-$report = new grade_report_stats($courseid, $gpr, $context);
-
-
-/// Build report to output
-$report->load_users();
-$report->harvest_data();
-$report->report_data();
-$report->adapt_data(true);
-
-/// Print report
-echo '<html><title>' . $reportname . ' for '  . $course->shortname .  '</title><body>';
-echo '<div style="font-size:25px; text-align:center; font-weight:bold">' . $course->fullname . ': ' . $reportname. '</div>';
-echo '<div style="text-align:center;">' . userdate(time()) . '</div>';
-echo '<br/><br/>';
-echo $report->html;
-echo '</body></html>';
-?>
\ No newline at end of file
diff --git a/grade/report/stats/settings.php b/grade/report/stats/settings.php
deleted file mode 100644
index 8037e7deba..0000000000
--- a/grade/report/stats/settings.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php // $Id$
-
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.com                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards Martin Dougiamas  http://dougiamas.com     //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-
-$strshow = get_string('statsshow', 'gradereport_stats') . ' ';
-
-/// Add settings for this module to the $settings object (it's already defined)
-$settings->add(new admin_setting_configselect('grade_report_stats_aggregationposition', 
-    get_string('aggregationposition', 'grades'), 
-    get_string('configaggregationposition', 'grades'), 
-    GRADE_REPORT_AGGREGATION_POSITION_LAST, 
-    array(GRADE_REPORT_AGGREGATION_POSITION_FIRST => get_string('positionfirst', 'grades'),
-          GRADE_REPORT_AGGREGATION_POSITION_LAST => get_string('positionlast', 'grades'))));
-
-$settings->add(new admin_setting_configcheckbox('grade_report_statshighest', 
-    $strshow . get_string('highest', 'gradereport_stats'),
-    get_string('stats:stat:highest', 'gradereport_stats'), 1));
-
-$settings->add(new admin_setting_configcheckbox('grade_report_statslowest', 
-    $strshow . get_string('lowest', 'gradereport_stats'),
-    get_string('stats:stat:lowest', 'gradereport_stats'), 1));
-
-$settings->add(new admin_setting_configcheckbox('grade_report_statsmean', 
-    $strshow . get_string('mean', 'gradereport_stats'),
-    get_string('stats:stat:mean', 'gradereport_stats'), 1));
-
-$settings->add(new admin_setting_configcheckbox('grade_report_statsmedian', 
-    $strshow . get_string('median', 'gradereport_stats'),
-    get_string('stats:stat:median', 'gradereport_stats'), 1));
-
-$settings->add(new admin_setting_configcheckbox('grade_report_statsmode', 
-    $strshow . get_string('mode', 'gradereport_stats'),
-    get_string('stats:stat:mode', 'gradereport_stats'), 1));
-
-$settings->add(new admin_setting_configcheckbox('grade_report_statspass_percent', 
-    $strshow . get_string('pass_percent', 'gradereport_stats'),
-    get_string('stats:stat:passpercent', 'gradereport_stats'), 1));
-
-$settings->add(new admin_setting_configcheckbox('grade_report_statsstandard_deviation', 
-    $strshow . get_string('standarddeviation', 'gradereport_stats'),
-    get_string('stats:stat:standarddeviation', 'gradereport_stats'), 1));
-
-$settings->add(new admin_setting_configcheckbox('grade_report_statsshowgroups', 
-    $strshow . get_string('showgroups', 'gradereport_stats'),
-    get_string('showgroups', 'gradereport_stats'), 1));
-
-$settings->add(new admin_setting_configcheckbox('grade_report_statsshowranges', 
-    $strshow . get_string('showranges', 'gradereport_stats'),
-    get_string('showranges', 'gradereport_stats'), 1));
-
-$settings->add(new admin_setting_configcheckbox('grade_report_statsshownumgrades', 
-    $strshow . get_string('shownumgrades', 'gradereport_stats'),
-    get_string('shownumgrades', 'gradereport_stats'), 1));
-
-$settings->add(new admin_setting_configcheckbox('grade_report_statsshowscaleitems', 
-    $strshow . get_string('showscaleitems', 'gradereport_stats'),
-    get_string('showscaleitems', 'gradereport_stats'), 1));
-
-$settings->add(new admin_setting_configcheckbox('grade_report_statsshowvalueitems', 
-    $strshow . get_string('showvalueitems', 'gradereport_stats'),
-    get_string('showvalueitems', 'gradereport_stats'), 1));
-
-$settings->add(new admin_setting_configcheckbox('grade_report_statsshowinverted', 
-    $strshow . get_string('showinverted', 'gradereport_stats'),
-    get_string('showinverted', 'gradereport_stats'), 1))
-;
-$settings->add(new admin_setting_configcheckbox('grade_report_statsincompleasmin', 
-    $strshow . get_string('incompleasmin', 'gradereport_stats'),
-    get_string('incompleasmin', 'gradereport_stats'), 0));
-
-$settings->add(new admin_setting_configcheckbox('grade_report_statsusehidden', 
-    $strshow . get_string('usehidden', 'gradereport_stats'),
-    get_string('usehidden', 'gradereport_stats'), 1));
-
-$settings->add(new admin_setting_configcheckbox('grade_report_statsuselocked', 
-    $strshow . get_string('uselocked', 'gradereport_stats'),
-    get_string('uselocked', 'gradereport_stats'), 1));
-
-?>
diff --git a/grade/report/stats/statistics/stat_highest.php b/grade/report/stats/statistics/stat_highest.php
deleted file mode 100755
index eb353aad50..0000000000
--- a/grade/report/stats/statistics/stat_highest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.org                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-require_once($CFG->dirroot . '/grade/report/stats/statistics/stats.php');
-
-/**
-* Stats class for finding the highest grade for an item in a course.
-*/
-class highest extends stats {
-    public function __construct() {
-        parent::__construct(get_string('highest', 'gradereport_stats'));
-        $this->capability = 'gradereport/stats:stat:highest';
-    }
-
-    public function report_data($final_grades, $item=null){
-        return max($final_grades);
-    }
-}
-
-?>
\ No newline at end of file
diff --git a/grade/report/stats/statistics/stat_lowest.php b/grade/report/stats/statistics/stat_lowest.php
deleted file mode 100755
index 44100e9abe..0000000000
--- a/grade/report/stats/statistics/stat_lowest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.org                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-require_once($CFG->dirroot . '/grade/report/stats/statistics/stats.php');
-
-/**
-* Stats class for finding the lowest grade for an item in a course.
-*/
-class lowest extends stats {
-    public function __construct() {
-        parent::__construct(get_string('lowest', 'gradereport_stats'));
-        $this->capability = 'gradereport/stats:stat:lowest';
-    }
-
-    public function report_data($final_grades, $item=null){
-        return min($final_grades);
-    }
-}
-
-?>
\ No newline at end of file
diff --git a/grade/report/stats/statistics/stat_mean.php b/grade/report/stats/statistics/stat_mean.php
deleted file mode 100755
index 1ad200f1d5..0000000000
--- a/grade/report/stats/statistics/stat_mean.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.org                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-require_once($CFG->dirroot . '/grade/report/stats/statistics/stats.php');
-
-/**
- * Stats class for finding the mean of the set of grades for an item in a course.
- */
-class mean extends stats {
-    public function __construct() {
-        parent::__construct(get_string('mean', 'gradereport_stats'));
-        $this->capability = 'gradereport/stats:stat:mean';
-    }
-
-    public function report_data($final_grades, $item=null){
-        return (array_sum($final_grades) / count($final_grades));
-    }
-}
-
-?>
\ No newline at end of file
diff --git a/grade/report/stats/statistics/stat_median.php b/grade/report/stats/statistics/stat_median.php
deleted file mode 100755
index 1b15862ef0..0000000000
--- a/grade/report/stats/statistics/stat_median.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.org                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-require_once($CFG->dirroot . '/grade/report/stats/statistics/stats.php');
-
-/**
- * Stats class for finding the median of a set of grades for an item in a course.
- */
-class median extends stats {
-    public function __construct() {
-        parent::__construct(get_string('median', 'gradereport_stats'));
-        $this->capability = 'gradereport/stats:stat:median';
-    }
-
-    public function report_data($final_grades, $item=null){
-        $midpoint = (count($final_grades) - 1) / 2;
-        return ($final_grades[floor($midpoint)] + $final_grades[ceil($midpoint)]) / 2;
-    }
-}
-
-?>
\ No newline at end of file
diff --git a/grade/report/stats/statistics/stat_mode.php b/grade/report/stats/statistics/stat_mode.php
deleted file mode 100755
index 7bafd80359..0000000000
--- a/grade/report/stats/statistics/stat_mode.php
+++ /dev/null
@@ -1,64 +0,0 @@
- 
-<?php
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.org                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-require_once($CFG->dirroot . '/grade/report/stats/statistics/stats.php');
-
-/**
- * Stats class for finding the mode of a set of grades in an item in a course.
- * NOTE: To pervent students from being able to find a list of all grades when
- * there are no grades the same (or to many in the same) the mode will not be
- * shown when there are over $maxmode number of modes.
- */
-class mode extends stats {
-    public static $maxmode = 5;
-	
-	public function __construct() {
-        parent::__construct(get_string('mode', 'gradereport_stats'));
-		$this->capability = 'gradereport/stats:stat:mode';
-	}
-
-    public function report_data($final_grades, $item=null){
-        $occurrences = array();
-		$modes = array();
-	
-		foreach($final_grades as $grade) {
-			if(!array_key_exists(sprintf('%f', round($grade,2)), $occurrences)) {
-				$occurrences[sprintf('%f', round($grade,2))] = 1;
-			} else {
-				$occurrences[sprintf('%f', round($grade,2))]++;
-			}
-		}
-	
-		arsort($occurrences);
-		$modes = array_keys($occurrences, current($occurrences));
-	
-		if(count($modes) <= mode::$maxmode) {
-			return $modes;
-		} else {
-			return null;
-		}
-    }
-}
-?>
\ No newline at end of file
diff --git a/grade/report/stats/statistics/stat_pass_percent.php b/grade/report/stats/statistics/stat_pass_percent.php
deleted file mode 100755
index 023a32a2fc..0000000000
--- a/grade/report/stats/statistics/stat_pass_percent.php
+++ /dev/null
@@ -1,52 +0,0 @@
- <?php
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.org                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-require_once($CFG->dirroot . '/grade/report/stats/statistics/stats.php');
-require_once($CFG->dirroot . '/lib/grade/grade_grade.php');
-
-/**
- * Stats class for finding the percent of grades above the set
- * gradepass for the item in a course.
- * NOTE: This statistic depends on gradepass being set for an item,
- * by defualt it is set to 0, witch is also noramly what the mingrade is
- * so it will show the pass percent as 100% if everything is left as default.
- */
-class pass_percent extends stats {
-    public function __construct() {
-        parent::__construct(get_string('pass_percent', 'gradereport_stats'), GRADE_DISPLAY_TYPE_PERCENTAGE);
-		$this->capability = 'gradereport/stats:stat:passpercent';
-	}
-
-    public function report_data($final_grades, $item=null){
-		$numpass = 0;
-		foreach($final_grades as $grade) {
-			if($grade >= $item->gradepass) {
-				$numpass++;
-			}
-		}
-	
-		return grade_grade::standardise_score($numpass / count($final_grades),  0, 1, $item->grademin, $item->grademax);
-    }
-}
-?>
\ No newline at end of file
diff --git a/grade/report/stats/statistics/stat_standard_deviation.php b/grade/report/stats/statistics/stat_standard_deviation.php
deleted file mode 100755
index c52955dda3..0000000000
--- a/grade/report/stats/statistics/stat_standard_deviation.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.org                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-require_once($CFG->dirroot . '/grade/report/stats/statistics/stats.php');
-
-/**
- * Stats class for finding the standard deviation of the grades for an item in a course.
- */
-class standard_deviation extends stats {
-    public function __construct() {
-        parent::__construct(get_string('standarddeviation', 'gradereport_stats'));
-		$this->capability = 'gradereport/stats:stat:standarddeviation';
-	}
-
-    public function report_data($final_grades, $item=null){
-		$sum = 0;
-		$n = count($final_grades);
-		$avg = array_sum($final_grades) / $n;
-	
-		foreach($final_grades as $grade) {
-			$sum += pow($grade - $avg, 2);
-		}
-	    
-		return sqrt($sum / $n);
-    }
-}
-
-?>
\ No newline at end of file
diff --git a/grade/report/stats/statistics/stats.php b/grade/report/stats/statistics/stats.php
deleted file mode 100755
index afa941b802..0000000000
--- a/grade/report/stats/statistics/stats.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.org                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-/**
- *File that defines the abstract stats class.
- * @package gradebook
- */
- 
- /**
- * Abstract class stats to be extended by classes that will be
- * defining new statistics for the report/stats plugin.
- */
-abstract class stats {
-    /**
-     * The name of this statistic.
-     * @var string $name
-     */
-    public $name;
-    
-    /**
-     * The display type to use when outputing this result of this
-     * statistic. If null the defualt item display type will be used.
-     * @var int $displaytype
-     */
-    public $displaytype = null;
-    
-    /**
-     * The nummber of decimals to use when displaying the result
-     * of this statistic. If null the defualt item decimals are used.
-     */
-    public $decimals = null;
-    
-    public $capability = null;
-
-    /**
-     * Constructor for stats.
-     * @param string $name name of the statistic.
-     * @param int $displaytype
-     * @param int $decimals
-     */
-    public function __construct($name = null, $displaytype = null, $decimals=null) {
-        $this->name = $name;        
-        $this->displaytype = $displaytype;
-        $this->decimals = $decimals;
-
-        if($name == null) {
-            $this->name = get_string('statistic', 'gradereport_stats');
-        }
-    }
-
-    /**
-     * Abstract method that is called to make the statistic and
-     * do all the processing for it.
-     * @param array $final_grades ordered array of final grades.
-     * @iparam object $item the gradeable item for witch the grades are a part of.
-     * @returns an array or floating point value of the statistic.
-     */
-    abstract public function report_data($final_grades, $item=null);
-}
-
-?>
\ No newline at end of file
diff --git a/grade/report/stats/styles.php b/grade/report/stats/styles.php
deleted file mode 100755
index 5c79006928..0000000000
--- a/grade/report/stats/styles.php
+++ /dev/null
@@ -1,254 +0,0 @@
-.flexible th {
-    white-space:nowrap;
-}
-
-.gradestable th.user img {
-    width: 20px;
-}
-
-.gradestable th.user, .gradestable th.range {
-    white-space: nowrap;
-}
-
-.grade-report-stats table .catlevel1 {
-  background-color: #ffffff;
-}
-.grade-report-stats table .catlevel2 {
-  background-color: #eeeeee;
-}
-.grade-report-stats table .catlevel3 {
-  background-color: #dddddd;
-}
-
-.grade-report-stats table td.overridden {
-  background-color: #EFD9B3;
-}
-
-.grade-report-stats table tr.avg td.cell {
-    background-color: #efefff;
-}
-
-.grade-report-stats table tr.odd td.cell {
-    background-color: #efefef;
-}
-
-.grade-report-stats table tr.even td.overridden {
-  background-color: #F3E4C0; 
-}
-
-.grade-report-stats table tr.odd td.overridden {
-  background-color: #EFD9A4;
-}
-
-.grade-report-stats table tr.even td.excluded {
-  background-color: #EABFFF; 
-}
-
-.grade-report-stats table tr.odd td.excluded {
-  background-color: #E5AFFF;
-}
-
-.grade-report-stats table th th.heading th.heading.c0 th.header th.header.c0 {
-    border-width:1px;
-}
-
-.grade-report-stats table tr.odd th.header { 
-    
-    border-width:1px;
-}
-
-.grade-report-stats table td.vmarked, .grade-report-stats table tr.odd td.vmarked {
-    background-color: #ffcc33;
-}
-
-.grade-report-stats table td.hmarked, .grade-report-stats table tr.odd td.hmarked {
-    background-color: #ffff99;
-}
-
-.grade-report-stats table td.hmarked.vmarked, .grade-report-stats table tr.odd td.hmarked.vmarked{
-    background-color: #ffcc99;
-} 
-
-.grade-report-stats table tr.groupavg td.cell {
-    background-color: #efffef;
-}
-
-.grade-report-stats table tr.groupavg td.cell {
-  font-weight: bold;
-  color: #006400;
-}
-
-.grade-report-stats table tr.avg td.cell {
-  font-weight: bold;
-  color: #00008B;
-}
-
-.grade-report-stats table td.cat,
-.grade-report-stats table td.course {
-  font-weight: bold;
-}
-
-.grade-report-stats table {
-    font-size: 80%;
-    white-space: nowrap;
-    border-color: #D3D3D3;
-}
-
-.grade-report-stats table {
-  border-width:1px;
-  border-style:solid;
-  margin-top: 20px;
-  border-color: #D3D3D3;
-}
-
-.grade-report-stats #overDiv table {
-  margin: 0;  
-}
-
-.grade-report-stats #overDiv table td.feedback {
-  border: 0px;
-}
-.grade-report-stats #overDiv .feedback {
-  background-color: #AABBFF;
-  color: #000000;
-  font-family: Verdana;
-  font-size: 70%;
-  font-weight: normal;  
-}
-
-.grade-report-stats #overDiv .caption {
-  background-color: #5566CC;
-  color: #CCCCFF;
-  font-family: Arial;
-  font-size: 70%;
-  font-weight: bold;
-}
-
-.grade-report-stats div.submit {
-  margin-top: 20px;
-  text-align: center;
-}
-
-.grade-report-stats table td {
-  border-width:1px;
-  border-style:solid;
-  border-color: #D3D3D3;
-}
-
-.grade-report-stats table tr.heading {
-  border-width:0px 0px 0px 0px;
-  border-style:solid;
-  border-color: #D3D3D3;
-}
-
-.grade-report-stats table .heading td {
-  border-width:0px 0px 0px 0px;
-  border-style:solid;
-  border-color: #D3D3D3;
-}
-
-.grade-report-stats table th.category {
-  border-width:1px 1px 1px 1px;
-  border-style:solid;
-  border-color: #D3D3D3;
-  vertical-align: top;
-}
-
-.grade-report-stats table th.user {
-  border-width:0px 0px 1px 0px;
-  border-style:solid;
-  border-color: #D3D3D3;
-}
-
-.grade-report-stats table th.useridnumber {
-  border-width:0px 0px 1px 1px;
-  border-style:solid;
-  border-color: #D3D3D3;
-}
-
-.grade-report-stats table th.categoryitem,
-.grade-report-stats table th.courseitem,
-.grade-report-stats table td.topleft {
-  border-width:0px 1px 0px 1px;
-  border-style:solid;
-  vertical-align: top;
-  border-color: #D3D3D3;
-}
-
-.grade-report-stats table#participants th {
-  vertical-align: top; 
-}
-
-.grade-report-stats table td.fillerfirst {
-  border-width:0px 0px 0px 1px;
-  border-style:solid;
-  border-color: #D3D3D3;
-}
-
-.grade-report-stats table td.fillerlast {
-  border-width:0px 1px 0px 0px;
-  border-style:solid;
-  border-color: #D3D3D3;
-}
-
-.grade-report-stats table th.item {
-  border-width:1px 1px 1px 1px;
-  border-style:solid;
-  border-color: #D3D3D3;
-  vertical-align: top;
-}
-
-.grade-report-stats div.gradertoggle {
-  display: inline;
-  margin-left: 20px;
-}
-
-.grade-report-stats table {
-  margin-left:auto;
-  margin-right:auto;
-}
-
-.grade-report-stats table  th.user {
-  text-align:left;
-}
-
-.grade-report-stats table  td.useridnumber {
-  text-align:left;
-}
-
-.grade-report-stats table  td {
-  text-align:right;
-}
-
-.grade-report-stats table th.range {
-  border-width:1px 1px 1px 1px;
-  border-style:solid;
-  border-color: #D3D3D3;
-}
-
-.grade-report-stats table .userpic {
-  display: inline;
-  margin-right: 10px;
-}
-
-.grade-report-stats table .quickfeedback {
-  border: #000000 1px dashed;
-}
-
-.grade-report-stats #siteconfiglink {
-  text-align: right;
-}
-
-.grade-report-stats table .hidden,
-.grade-report-stats table .hidden a {
-  color:#aaaaaa;
-}
-
-.grade-report-stats table .datesubmitted {
-  font-size: 0.7em;
-}
-
-.grade-report-stats table td.cell {
-  padding-left: 5px;
-  padding-right: 5px;
-}
diff --git a/grade/report/stats/tabs.php b/grade/report/stats/tabs.php
deleted file mode 100755
index abc8b665c9..0000000000
--- a/grade/report/stats/tabs.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.org                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-    /**
-     * Sets up the tabs for the report/stats plug-in and displays them.
-     * @package gradebook
-     */
-
-    $row = $tabs = array();
-    $tabcontext = get_context_instance(CONTEXT_COURSE, $COURSE->id);
-    $row[] = new tabobject('statsreport',
-                           $CFG->wwwroot.'/grade/report/stats/index.php?id='.$courseid,
-                           get_string('modulename', 'gradereport_stats'));
-    
-    $row[] = new tabobject('preferences',
-                           $CFG->wwwroot.'/grade/report/stats/preferences.php?id='.$courseid,
-                           get_string('myreportpreferences', 'grades'));
-    
-    /// A bit of a hack to make the printable tab open a new window.
-    $row[] = new tabobject('printable',
-                           '#" onClick="javascript:window.open(\'' . $CFG->wwwroot. '/grade/report/stats/print.php?id=' . $courseid . '\')',
-                           get_string('printable', 'gradereport_stats'));
-
-    $tabs[] = $row;
-    echo '<div class="gradedisplay">';
-    print_tabs($tabs, $currenttab);
-    echo '</div>';
-?>
\ No newline at end of file
diff --git a/grade/report/stats/version.php b/grade/report/stats/version.php
deleted file mode 100755
index 6aa9c25528..0000000000
--- a/grade/report/stats/version.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?PHP 
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.org                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-$plugin->version  = 2008061400;
-$plugin->requires = 2007101000;
-
-?>
diff --git a/grade/report/visual/AC_OETags.js b/grade/report/visual/AC_OETags.js
deleted file mode 100644
index e77e6fd8a6..0000000000
--- a/grade/report/visual/AC_OETags.js
+++ /dev/null
@@ -1,276 +0,0 @@
-// Flash Player Version Detection - Rev 1.6
-// Detect Client Browser type
-// Copyright(c) 2005-2006 Adobe Macromedia Software, LLC. All rights reserved.
-var isIE  = (navigator.appVersion.indexOf("MSIE") != -1) ? true : false;
-var isWin = (navigator.appVersion.toLowerCase().indexOf("win") != -1) ? true : false;
-var isOpera = (navigator.userAgent.indexOf("Opera") != -1) ? true : false;
-
-function ControlVersion()
-{
-	var version;
-	var axo;
-	var e;
-
-	// NOTE : new ActiveXObject(strFoo) throws an exception if strFoo isn't in the registry
-
-	try {
-		// version will be set for 7.X or greater players
-		axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.7");
-		version = axo.GetVariable("$version");
-	} catch (e) {
-	}
-
-	if (!version)
-	{
-		try {
-			// version will be set for 6.X players only
-			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.6");
-			
-			// installed player is some revision of 6.0
-			// GetVariable("$version") crashes for versions 6.0.22 through 6.0.29,
-			// so we have to be careful. 
-			
-			// default to the first public version
-			version = "WIN 6,0,21,0";
-
-			// throws if AllowScripAccess does not exist (introduced in 6.0r47)		
-			axo.AllowScriptAccess = "always";
-
-			// safe to call for 6.0r47 or greater
-			version = axo.GetVariable("$version");
-
-		} catch (e) {
-		}
-	}
-
-	if (!version)
-	{
-		try {
-			// version will be set for 4.X or 5.X player
-			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.3");
-			version = axo.GetVariable("$version");
-		} catch (e) {
-		}
-	}
-
-	if (!version)
-	{
-		try {
-			// version will be set for 3.X player
-			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.3");
-			version = "WIN 3,0,18,0";
-		} catch (e) {
-		}
-	}
-
-	if (!version)
-	{
-		try {
-			// version will be set for 2.X player
-			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash");
-			version = "WIN 2,0,0,11";
-		} catch (e) {
-			version = -1;
-		}
-	}
-	
-	return version;
-}
-
-// JavaScript helper required to detect Flash Player PlugIn version information
-function GetSwfVer(){
-	// NS/Opera version >= 3 check for Flash plugin in plugin array
-	var flashVer = -1;
-	
-	if (navigator.plugins != null && navigator.plugins.length > 0) {
-		if (navigator.plugins["Shockwave Flash 2.0"] || navigator.plugins["Shockwave Flash"]) {
-			var swVer2 = navigator.plugins["Shockwave Flash 2.0"] ? " 2.0" : "";
-			var flashDescription = navigator.plugins["Shockwave Flash" + swVer2].description;
-			var descArray = flashDescription.split(" ");
-			var tempArrayMajor = descArray[2].split(".");			
-			var versionMajor = tempArrayMajor[0];
-			var versionMinor = tempArrayMajor[1];
-			var versionRevision = descArray[3];
-			if (versionRevision == "") {
-				versionRevision = descArray[4];
-			}
-			if (versionRevision[0] == "d") {
-				versionRevision = versionRevision.substring(1);
-			} else if (versionRevision[0] == "r") {
-				versionRevision = versionRevision.substring(1);
-				if (versionRevision.indexOf("d") > 0) {
-					versionRevision = versionRevision.substring(0, versionRevision.indexOf("d"));
-				}
-			}
-			var flashVer = versionMajor + "." + versionMinor + "." + versionRevision;
-		}
-	}
-	// MSN/WebTV 2.6 supports Flash 4
-	else if (navigator.userAgent.toLowerCase().indexOf("webtv/2.6") != -1) flashVer = 4;
-	// WebTV 2.5 supports Flash 3
-	else if (navigator.userAgent.toLowerCase().indexOf("webtv/2.5") != -1) flashVer = 3;
-	// older WebTV supports Flash 2
-	else if (navigator.userAgent.toLowerCase().indexOf("webtv") != -1) flashVer = 2;
-	else if ( isIE && isWin && !isOpera ) {
-		flashVer = ControlVersion();
-	}	
-	return flashVer;
-}
-
-// When called with reqMajorVer, reqMinorVer, reqRevision returns true if that version or greater is available
-function DetectFlashVer(reqMajorVer, reqMinorVer, reqRevision)
-{
-	versionStr = GetSwfVer();
-	if (versionStr == -1 ) {
-		return false;
-	} else if (versionStr != 0) {
-		if(isIE && isWin && !isOpera) {
-			// Given "WIN 2,0,0,11"
-			tempArray         = versionStr.split(" "); 	// ["WIN", "2,0,0,11"]
-			tempString        = tempArray[1];			// "2,0,0,11"
-			versionArray      = tempString.split(",");	// ['2', '0', '0', '11']
-		} else {
-			versionArray      = versionStr.split(".");
-		}
-		var versionMajor      = versionArray[0];
-		var versionMinor      = versionArray[1];
-		var versionRevision   = versionArray[2];
-
-        	// is the major.revision >= requested major.revision AND the minor version >= requested minor
-		if (versionMajor > parseFloat(reqMajorVer)) {
-			return true;
-		} else if (versionMajor == parseFloat(reqMajorVer)) {
-			if (versionMinor > parseFloat(reqMinorVer))
-				return true;
-			else if (versionMinor == parseFloat(reqMinorVer)) {
-				if (versionRevision >= parseFloat(reqRevision))
-					return true;
-			}
-		}
-		return false;
-	}
-}
-
-function AC_AddExtension(src, ext)
-{
-  if (src.indexOf('?') != -1)
-    return src.replace(/\?/, ext+'?'); 
-  else
-    return src + ext;
-}
-
-function AC_Generateobj(objAttrs, params, embedAttrs) 
-{ 
-    var str = '';
-    if (isIE && isWin && !isOpera)
-    {
-  		str += '<object ';
-  		for (var i in objAttrs)
-  			str += i + '="' + objAttrs[i] + '" ';
-  		str += '>';
-  		for (var i in params)
-  			str += '<param name="' + i + '" value="' + params[i] + '" /> ';
-  		str += '</object>';
-    } else {
-  		str += '<embed ';
-  		for (var i in embedAttrs)
-  			str += i + '="' + embedAttrs[i] + '" ';
-  		str += '> </embed>';
-    }
-
-    document.write(str);
-}
-
-function AC_FL_RunContent(){
-  var ret = 
-    AC_GetArgs
-    (  arguments, ".swf", "movie", "clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"
-     , "application/x-shockwave-flash"
-    );
-  AC_Generateobj(ret.objAttrs, ret.params, ret.embedAttrs);
-}
-
-function AC_GetArgs(args, ext, srcParamName, classid, mimeType){
-  var ret = new Object();
-  ret.embedAttrs = new Object();
-  ret.params = new Object();
-  ret.objAttrs = new Object();
-  for (var i=0; i < args.length; i=i+2){
-    var currArg = args[i].toLowerCase();    
-
-    switch (currArg){	
-      case "classid":
-        break;
-      case "pluginspage":
-        ret.embedAttrs[args[i]] = args[i+1];
-        break;
-      case "src":
-      case "movie":	
-        args[i+1] = AC_AddExtension(args[i+1], ext);
-        ret.embedAttrs["src"] = args[i+1];
-        ret.params[srcParamName] = args[i+1];
-        break;
-      case "onafterupdate":
-      case "onbeforeupdate":
-      case "onblur":
-      case "oncellchange":
-      case "onclick":
-      case "ondblClick":
-      case "ondrag":
-      case "ondragend":
-      case "ondragenter":
-      case "ondragleave":
-      case "ondragover":
-      case "ondrop":
-      case "onfinish":
-      case "onfocus":
-      case "onhelp":
-      case "onmousedown":
-      case "onmouseup":
-      case "onmouseover":
-      case "onmousemove":
-      case "onmouseout":
-      case "onkeypress":
-      case "onkeydown":
-      case "onkeyup":
-      case "onload":
-      case "onlosecapture":
-      case "onpropertychange":
-      case "onreadystatechange":
-      case "onrowsdelete":
-      case "onrowenter":
-      case "onrowexit":
-      case "onrowsinserted":
-      case "onstart":
-      case "onscroll":
-      case "onbeforeeditfocus":
-      case "onactivate":
-      case "onbeforedeactivate":
-      case "ondeactivate":
-      case "type":
-      case "codebase":
-        ret.objAttrs[args[i]] = args[i+1];
-        break;
-      case "id":
-      case "width":
-      case "height":
-      case "align":
-      case "vspace": 
-      case "hspace":
-      case "class":
-      case "title":
-      case "accesskey":
-      case "name":
-      case "tabindex":
-        ret.embedAttrs[args[i]] = ret.objAttrs[args[i]] = args[i+1];
-        break;
-      default:
-        ret.embedAttrs[args[i]] = ret.params[args[i]] = args[i+1];
-    }
-  }
-  ret.objAttrs["classid"] = classid;
-  if (mimeType) ret.embedAttrs["type"] = mimeType;
-  return ret;
-}
-
-
diff --git a/grade/report/visual/README.txt b/grade/report/visual/README.txt
deleted file mode 100644
index bc52210da4..0000000000
--- a/grade/report/visual/README.txt
+++ /dev/null
@@ -1,123 +0,0 @@
- __  __                                   ___
-/\ \/\ \   __                            /\_ \
-\ \ \ \ \ /\_\     ____   __  __     __  \//\ \
- \ \ \ \ \\/\ \   /',__\ /\ \/\ \  /'__`\  \ \ \
-  \ \ \_/ \\ \ \ /\__, `\\ \ \_\ \/\ \L\.\_ \_\ \_
-   \ `\___/ \ \_\\/\____/ \ \____/\ \__/.\_\/\____\
-    `\/__/   \/_/ \/___/   \/___/  \/__/\/_/\/____/
- ____                                      __
-/\  _`\                                   /\ \__
-\ \ \L\ \      __   _____     ___    _ __ \ \ ,_\
- \ \ ,  /    /'__`\/\ '__`\  / __`\ /\`'__\\ \ \/
-  \ \ \\ \  /\  __/\ \ \L\ \/\ \L\ \\ \ \/  \ \ \_
-   \ \_\ \_\\ \____\\ \ ,__/\ \____/ \ \_\   \ \__\
-    \/_/\/ / \/____/ \ \ \/  \/___/   \/_/    \/__/
-                      \ \_\
-                       \/_/       ,+7$$Z$ZO= 
-                    :+$$Z$$ZOZZZOOOOOOOOD,:,,,
-                 +Z$ZOOO8OO8OOOOOOOOO8+====~~:,
-               7$ZOOOOZOZOOOOOOOOOO8+++++=~:,
-            77$88OZ8MMDZZZOOOOOOOZ+?++==~:,
-         77Z$$Z8MM8OZOZZZZOOOO8ONDN+=~:,
-       I7$Z$NMOOOOOO$$$ZZOOOOOD8D8D8:,
-    II7$7MDZOOZZZZOZ$$ZZ$OOZNDNDDDD8DO         ,IIII777I~ 
- 7?$$ZOMOOZZZ777MMMMMMMMMMMDNDN8DDDD$$7,   =+++++???IIII7777$? 
-   ,,,:Z==++===7NMMMND8DDDMMD8DDDDD777777:?=~~~~==+++???II777$$$, 
-    ,:DM~~~~::,O8ND8OO8Z$$$$DDDDDD7IIIIII+~~~=?I77$$$$77IIII77$$Z+, 
-      ,8,,,,   ONND$ZZ$$777DDDDNDO$77II??+++I7$ZZOOOOZZ$77IIII7$ZZZ:,
-       M,::,   O$D888ZO$II77DDD88OZ$7IIIIIII7$ZOO8OOOOOZ$77III77$ZO=:
-      =M,,,    ?+~~+I$$$ZI778D$I?+=$77IIIII7$ZOO++===~~~$$7IIII7$ZOO~: 
-      OM,,,    I?==?I7$O8D777?+=:,,:77I?III7ZOO++=~:,,,,:77I?II7$ZOO=~,
-      8MI::,   I?=+II7$O8??+=~:,    77I?II7$ZOO+=~,      ?7I??II$ZOO+~: 
-      ~M=~~,   I?++II7ZOO+=~,       II?+?I7$ZOO=~,       ,II+?II7ZOO+~: 
-       M::~:   I?++II7ZOO+=:,       II++?I7$ZOO=~,        II++II7ZOO+~: 
-       M,:~:   I?++II7ZOO+=:        II++?II$ZOO=~,        I?++II7ZOO+=: 
-       M=::,   I?++II7ZOO+=:        II++?II$ZOO=~,        I?++II7ZOO+=:
-       MI:::   I?++?I7ZOO+=:        II++?II$ZOO=~,        I?=+II7ZOO+=: 
-      ,M?:~:   I?++?I7$OO+=:        II+=?II$ZOO=~,        I?=+II7ZOO+=:
-      =M=:~:   I?++?I7$OO+=:        II+=?II$ZOO=~,        I?=+II7ZOO+=:
-       M,:~:   I?++?I7$OO+=:        II+=?II$ZOO=~,        I?=+II7ZOO+~: 
-       M,:~:   I?++?I7$OO+=:        II+=?II$ZOO=~,        I?=+II7ZOO+~: 
-       M,::,   I?++?I7$OO+=:        II+=?II$ZOO=~,        I?=+II7ZOO+~: 
-         ,:,   I?++?I7$OO+=:        II+=?II$ZOO=~,        I?=+II7ZOO+~: 
-          ,    IIII77$ZOO+=:        IIIII77$OOO=~,        IIII77$ZOO+~:
-               77$$ZZZOOO+=:        77$$ZZZOOOO=~,        77$ZZZOOOO+~:
-               $ZOOOOOOOO+=:        $$ZOOOOOOOO=~,        $ZOOOOOOOO+=:
-
-
-=== About Visual Report ===
-The visual report gradebook plug-in was developed as part of a Google
-Summer of Code 2008 project The goal of the plug-in is to provide a
-framework for providing flash based visualizations for gradebook data
-using flex and the flare action script libraries. Several visualizations
-such as Average Grades vs Items, Normalized Grades vs Students, and
-several different types of Grade Distributions are included and new
-visualizations can be easily dropped in by developers.
-
-
-=== About Author ===
-This plug-in was originally created by a computer science student named Daniel Servos as part of
-a Google Summer of Code 2008 project.
-
-==== Contact Information ====
-Name: Daniel Servos
-E-mail: dservos@lakeheadu.ca
-Blog: HackerDan.com
-
-
-=== Copyright ===
-Moodle - Modular Object-Oriented Dynamic Learning Environment
-http://moodle.org
-
-Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com
-
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU
-General Public License as published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
-even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-General Public License for more details:
-
-http://www.gnu.org/copyleft/gpl.html
-
-
-=== Version / Release ===
-This plug-in was developed for Moodle 2.0 dev.
-
-This is the first real release of this plug-in and should be considered an beta version in that it
-has not yet had a chance to be extensively tested by users in real life situations and may have
-unknown bugs or issues.
-
-Version: 1.0.0b
-
-
-=== Development Information ===
-==== Front End ====
-The flash front end for this visualization was made in adobe flex builder 3 for linux and uses an
-alpha version of the flare actionscript libbary. The source code for the fron end can be found in
-the ./flare_visualization/ dir with the flare libs that where used. Flare is open source and can
-be found at http://flare.prefuse.org/. The newest version of flare changed several things so the
-included copy of the flare lib is needed to complie the front end and the fron end code still 
-needs to be ported to the newest flare realse. 
-
-==== Adding new Visualizations ====
-To add a new visualization to the plug-in, extend the abstract class visualization (grade/report/stats/visualizations/visualization.php) and place you class in a file name
-visual_yournamehere.php in grade/report/stats/visualizations and it should be automatically loaded
-in to plug-in.
-
-==== Specification ====
-http://docs.moodle.org/en/Student_projects/Animated_grade_statistics_report
-
-==== TO DO ====
-* Add more visualizations.
-* Back port to Moodle 1.9.x
-* Export functionality to other programs and document types like excel.
-* Port to flare 2008.07.29 (new major flare release that had some big changes to the API witch
-would require some recoding of the plug-in?s front end).
-* Account for outcomes.
-* "Find me in data" - a feature i wanted to add to show a user where they are in the data being
-visualized.
-* Better looking graphically and more natural UI.
-* Add visualizations that go beyond just grades in a course. Compare different courses, years,
-drop out trends, age of students, submission times, etc.
diff --git a/grade/report/visual/data.php b/grade/report/visual/data.php
deleted file mode 100644
index 8bd1676c49..0000000000
--- a/grade/report/visual/data.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.org                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-/**
- * Page to be read in by the flex application.
- * Outputs data for a visulasation in tab format.
- */
-
-// TODO: This needs to be replaced by web service user keys
-
-/// Get a session id from the URI request and make a cookie
-/// for it temparaly. This is needed as the flex application will
-/// not have the users oringal cookie and only the session information
-/// witch is passed to it.
-$cookiewasset = false;
-if(empty($_COOKIE) && isset($_GET['sessionid']) && isset($_GET['sessioncookie']) && isset($_GET['sessiontest'])) {
-    $_COOKIE['MoodleSession' . $_GET['sessioncookie']] = $_GET['sessionid'];
-    $_COOKIE['MoodleSessionTest' . $_GET['sessioncookie']] = $_GET['sessiontest'];
-    $cookiewasset = true;
-}
-
-require_once '../../../config.php';
-require_once $CFG->libdir.'/gradelib.php';
-require_once $CFG->dirroot.'/grade/lib.php';
-require_once $CFG->dirroot.'/grade/report/visual/lib.php';
-
-$courseid = required_param('id', PARAM_INT);
-$visid = optional_param('visid', '', PARAM_ACTION);
-
-/// basic access checks
-if (!$course = $DB->get_record('course', array('id' => $courseid))) {
-    print_error('nocourseid');
-}
-require_login($course);
-$context = get_context_instance(CONTEXT_COURSE, $course->id);
-require_capability('gradereport/visual:view', $context);
-
-/// get tracking object
-$gpr = new grade_plugin_return(array('type'=>'report', 'plugin'=>'visual', 'courseid'=>$courseid));
-$report = new grade_report_visual($courseid, $gpr, $context, $visid);
-
-/// Make sure the user is allowed see this visualization
-require_capability(grade_report_visual::get_visualization($report->visid, $context)->capability, $context);
-
-grade_regrade_final_grades($courseid);
-
-/// Turn of error reporting as hummans will not be seeing 
-/// this and it will be read by the front end. Notices and 
-/// warnings will break the format and stop the
-/// front end from working.
-error_reporting(0);
-
-/// Get report object
-$report->load_users();
-$report->harvest_data();
-$report->report_data();
-$report->adapt_data();
-
-/// Clean up cookie if it was created.
-if($cookiewasset) {
-    $_COOKIE['MoodleSession' . $_GET['sessioncookie']] = null;
-    $_COOKIE['MoodleSessionTest' . $_GET['sessioncookie']] = null;
-}
-?>
\ No newline at end of file
diff --git a/grade/report/visual/db/access.php b/grade/report/visual/db/access.php
deleted file mode 100755
index dc927f0835..0000000000
--- a/grade/report/visual/db/access.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.org                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-$gradereport_visual_capabilities = array(
-    'gradereport/visual:view' => array(
-        'riskbitmask' => RISK_PERSONAL,
-        'captype' => 'read',
-        'contextlevel' => CONTEXT_COURSE,
-        'legacy' => array(
-            'student' => CAP_ALLOW,
-            'teacher' => CAP_ALLOW,
-            'editingteacher' => CAP_ALLOW,
-            'admin' => CAP_ALLOW
-        )
-    )
-);
-
-?>
diff --git a/grade/report/visual/flare_visualization.swf b/grade/report/visual/flare_visualization.swf
deleted file mode 100644
index 47cc948d73..0000000000
Binary files a/grade/report/visual/flare_visualization.swf and /dev/null differ
diff --git a/grade/report/visual/flare_visualization/.actionScriptProperties b/grade/report/visual/flare_visualization/.actionScriptProperties
deleted file mode 100644
index 8f59ddca66..0000000000
--- a/grade/report/visual/flare_visualization/.actionScriptProperties
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<actionScriptProperties mainApplicationPath="flare_visualization.as" version="3">
-  <compiler additionalCompilerArguments="" copyDependentFiles="true" enableModuleDebug="true" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="true" htmlHistoryManagement="true" htmlPlayerVersion="9.0.28" htmlPlayerVersionCheck="true" outputFolderPath="bin-debug" strict="true" useApolloConfig="false" verifyDigests="true" warn="true">
-    <compilerSourcePath/>
-    <libraryPath defaultLinkType="1">
-      <libraryPathEntry kind="4" path="">
-        <excludedEntries>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation_charts.swc" useDefaultLinkType="false"/>
-          <libraryPathEntry kind="1" linkType="1" path="${PROJECT_FRAMEWORKS}/locale/{locale}"/>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/qtp.swc" useDefaultLinkType="false"/>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/rpc.swc" useDefaultLinkType="false"/>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/charts.swc" useDefaultLinkType="false"/>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/framework.swc" useDefaultLinkType="false"/>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/datavisualization.swc" useDefaultLinkType="false"/>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation.swc" useDefaultLinkType="false"/>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation_dmv.swc" useDefaultLinkType="false"/>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation_flashflexkit.swc" useDefaultLinkType="false"/>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation_agent.swc" useDefaultLinkType="false"/>
-        </excludedEntries>
-      </libraryPathEntry>
-      <libraryPathEntry kind="3" linkType="1" path="/flare.util/bin/flare.util.swc" useDefaultLinkType="false"/>
-      <libraryPathEntry kind="3" linkType="1" path="/flare.animate/bin/flare.animate.swc" useDefaultLinkType="false"/>
-      <libraryPathEntry kind="3" linkType="1" path="/flare.flex/bin/flare.flex.swc" useDefaultLinkType="false"/>
-      <libraryPathEntry kind="3" linkType="1" path="/flare.data/bin/flare.data.swc" useDefaultLinkType="false"/>
-      <libraryPathEntry kind="3" linkType="1" path="/flare.physics/bin/flare.physics.swc" useDefaultLinkType="false"/>
-      <libraryPathEntry kind="3" linkType="1" path="/flare.query/bin/flare.query.swc" useDefaultLinkType="false"/>
-      <libraryPathEntry kind="3" linkType="1" path="/flare.vis/bin/flare.vis.swc" useDefaultLinkType="false"/>
-    </libraryPath>
-    <sourceAttachmentPath/>
-  </compiler>
-  <applications>
-    <application path="flare_visualization.as"/>
-  </applications>
-  <modules/>
-  <buildCSSFiles/>
-</actionScriptProperties>
diff --git a/grade/report/visual/flare_visualization/.project b/grade/report/visual/flare_visualization/.project
deleted file mode 100644
index 2d9ad4e9a3..0000000000
--- a/grade/report/visual/flare_visualization/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>flare_visualization</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.adobe.flexbuilder.project.flexbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.adobe.flexbuilder.project.actionscriptnature</nature>
-	</natures>
-</projectDescription>
diff --git a/grade/report/visual/flare_visualization/Button.as b/grade/report/visual/flare_visualization/Button.as
deleted file mode 100644
index 114d1bbfcd..0000000000
--- a/grade/report/visual/flare_visualization/Button.as
+++ /dev/null
@@ -1,127 +0,0 @@
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.org                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-package {
-	import flash.display.SimpleButton;
-	import flash.text.TextField;
-	import flash.text.TextFormat;
-
-	public class Button extends SimpleButton {
-		private var upColor:uint = 0x9999FF;
-    	private var overColor:uint = 0xBABAFF;
-    	private var downColor:uint = 0xBBBBFF;
-    	private var fmt:TextFormat = new TextFormat("monospace", 12, 0, null, null, null, null, null, "center");
-    	private var buttonText:String;
-    	private var alphaValue:Number = 0.6;
-    	
-    	public var props:Object = new Object();
-		
-		public function Button(text:String, settings:XMLList = null) {
-			if(settings != null) {
-				upColor = parseInt(settings.bgcolor, 16);
-				overColor = upColor + 0x212100;
-				downColor = upColor + 0x222200;
-				alphaValue = settings.alpha;
-				
-				fmt = new TextFormat(settings.text.font, settings.text.size, 0, null, null, null, null, null, "center");
-			
-				downState = new ButtonDisplayState(text, fmt, downColor, alphaValue, settings.line);
-        		overState = new ButtonDisplayState(text, fmt, overColor, alphaValue, settings.line);
-        		upState = new ButtonDisplayState(text, fmt, upColor, alphaValue, settings.line);
-			} else {
-				downState = new ButtonDisplayState(text, fmt, downColor, alphaValue);
-        		overState = new ButtonDisplayState(text, fmt, overColor, alphaValue);
-        		upState = new ButtonDisplayState(text, fmt, upColor, alphaValue);
-			}
-			
-			buttonText = text;
-        	hitTestState = upState;
-        	useHandCursor = true;	
-		}
-		
-		public function set text(text:String):void {
-			buttonText = text;
-			ButtonDisplayState(downState).text = text;
-			ButtonDisplayState(overState).text = text;
-			ButtonDisplayState(upState).text = text;
-		}
-		
-		public function get text():String {
-			return buttonText;
-		}
-	}
-}
-	
-import flash.display.Sprite;
-import flash.text.TextField;
-import flash.text.TextFormat;
-import flash.text.TextFieldAutoSize;
-import flare.display.TextSprite;
-
-class ButtonDisplayState extends Sprite
-{
-    private var bgColor:uint;
-    private var w:uint;
-    private var h:uint;
-	private var buttonText:String;
-	private var fmt:TextFormat;
-	private var ts:TextSprite;
-	private var alphaValue:Number
-	private var lineSettings:XMLList;
-
-	public function ButtonDisplayState(text:String, fmt:TextFormat, bgColor:uint = 0x9999FF, alphaValue:Number = 0.6, lineSettings:XMLList = null) {
-		this.bgColor = bgColor;
-		buttonText = text;
-		this.fmt = fmt;
-		this.ts = new TextSprite(text, fmt);
- 		this.alphaValue = alphaValue;
- 		this.lineSettings = lineSettings;
- 
-		var tf:TextField = ts.textField;
-		
-        w = tf.width = tf.textWidth + 6;
-        h = tf.height = tf.textHeight + 4;
-		ts.dirty();
-		
-        addChild(ts);
-        draw();
-    }
-
-    private function draw():void {
-		graphics.beginFill(bgColor, alphaValue);
-        
-        if(lineSettings == null) {
-        	graphics.lineStyle(1, 0x4444FF, 0.3, true);
-        } else {
-        	graphics.lineStyle(lineSettings.size, parseInt(lineSettings.color, 16), lineSettings.alpha, true);
-        }
-        
-        graphics.drawRoundRect(0, 0, w, h, 10, 10);
-        graphics.endFill();
-	}
-	
-	public function set text(text:String):void {
-		buttonText = text;
-		ts.text = text;
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/Selector.as b/grade/report/visual/flare_visualization/Selector.as
deleted file mode 100644
index 74e2a48219..0000000000
--- a/grade/report/visual/flare_visualization/Selector.as
+++ /dev/null
@@ -1,72 +0,0 @@
-package
-{
-	import flare.vis.controls.HoverControl;
-	
-	import flash.display.Sprite;
-	import flash.events.MouseEvent;
-	import flash.filters.GlowFilter;
-
-	public class Selector extends Sprite
-	{
-		public var param:String;
-		public var options:XMLList;
-		public var active:SelectorOption = null;
-		
-		public function Selector(param:String, options:XMLList, func:Function, active:String = null, borderWidth:Number = -1)
-		{
-			this.param = param;
-			this.options = options;
-		
-			for each(var option:XML in options) {
-				var selectorOption:SelectorOption;
-				
-				if(active != null && active != "" && option.value == active) {
-					selectorOption = new SelectorOption(param, option, true);
-					this.active = selectorOption;
-					selectorOption.alpha = 1;
-				} else {
-					selectorOption = new SelectorOption(param, option, false);
-					selectorOption.alpha = 0.4;
-				}
-				
-				var hc:HoverControl = new HoverControl(selectorOption);
-				selectorOption.x = 10;
-				selectorOption.y = this.height;
-				selectorOption.addEventListener(MouseEvent.CLICK, func);
-				hc.onRollOver = rollOver;
-				hc.onRollOut = rollOut;
-				addChild(selectorOption);
-			}
-			
-			this.graphics.lineStyle(1, 0x303030, 0.50);
-			
-			if(borderWidth < 0) {
-				this.graphics.drawRoundRect(1, 1, this.width, this.height, 15, 15);
-			} else if(borderWidth != 0) {
-				this.graphics.drawRoundRect(1, 1, max(borderWidth, this.width + 10), this.height, 15, 15);
-			}
-		}
-		
-		/**
-     	 * Simple function to retrun the greatest of two ints.
-     	 * @param num1 the first number to test
-     	 * @param num2 the second number to test
-     	 * @return the largest value between num1 and num2.
-     	 */
-     	private function max(num1:int, num2:int):int {
-     		if(num1 > num2) {
-     			return num1;
-     		} else {
-     			return num2;
-     		}
-     	}
-		
-		private function rollOver(soption:SelectorOption):void {
-			soption.filters = [new GlowFilter(0xFFFF55, 0.8, 6, 6, 10)];
-		}
-		
-		private function rollOut(soption:SelectorOption):void {
-			soption.filters = null;
-		}
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/SelectorOption.as b/grade/report/visual/flare_visualization/SelectorOption.as
deleted file mode 100644
index b760900ff3..0000000000
--- a/grade/report/visual/flare_visualization/SelectorOption.as
+++ /dev/null
@@ -1,20 +0,0 @@
-package
-{
-	import flare.display.TextSprite;
-	
-	import flash.text.TextFormat;
-	
-	public class SelectorOption extends TextSprite {
-		public var param:String;
-		public var value:String;
-		public var active:Boolean = false;
-	
-		public function SelectorOption(param:String, option:XML, active:Boolean = false) {
-			this.param = param;
-			this.value = option.value;
-			this.active = active;
-			
-			super(option.title, new TextFormat("timesnewromen"));
-		}
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/bin-debug/AC_OETags.js b/grade/report/visual/flare_visualization/bin-debug/AC_OETags.js
deleted file mode 100644
index e77e6fd8a6..0000000000
--- a/grade/report/visual/flare_visualization/bin-debug/AC_OETags.js
+++ /dev/null
@@ -1,276 +0,0 @@
-// Flash Player Version Detection - Rev 1.6
-// Detect Client Browser type
-// Copyright(c) 2005-2006 Adobe Macromedia Software, LLC. All rights reserved.
-var isIE  = (navigator.appVersion.indexOf("MSIE") != -1) ? true : false;
-var isWin = (navigator.appVersion.toLowerCase().indexOf("win") != -1) ? true : false;
-var isOpera = (navigator.userAgent.indexOf("Opera") != -1) ? true : false;
-
-function ControlVersion()
-{
-	var version;
-	var axo;
-	var e;
-
-	// NOTE : new ActiveXObject(strFoo) throws an exception if strFoo isn't in the registry
-
-	try {
-		// version will be set for 7.X or greater players
-		axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.7");
-		version = axo.GetVariable("$version");
-	} catch (e) {
-	}
-
-	if (!version)
-	{
-		try {
-			// version will be set for 6.X players only
-			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.6");
-			
-			// installed player is some revision of 6.0
-			// GetVariable("$version") crashes for versions 6.0.22 through 6.0.29,
-			// so we have to be careful. 
-			
-			// default to the first public version
-			version = "WIN 6,0,21,0";
-
-			// throws if AllowScripAccess does not exist (introduced in 6.0r47)		
-			axo.AllowScriptAccess = "always";
-
-			// safe to call for 6.0r47 or greater
-			version = axo.GetVariable("$version");
-
-		} catch (e) {
-		}
-	}
-
-	if (!version)
-	{
-		try {
-			// version will be set for 4.X or 5.X player
-			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.3");
-			version = axo.GetVariable("$version");
-		} catch (e) {
-		}
-	}
-
-	if (!version)
-	{
-		try {
-			// version will be set for 3.X player
-			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.3");
-			version = "WIN 3,0,18,0";
-		} catch (e) {
-		}
-	}
-
-	if (!version)
-	{
-		try {
-			// version will be set for 2.X player
-			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash");
-			version = "WIN 2,0,0,11";
-		} catch (e) {
-			version = -1;
-		}
-	}
-	
-	return version;
-}
-
-// JavaScript helper required to detect Flash Player PlugIn version information
-function GetSwfVer(){
-	// NS/Opera version >= 3 check for Flash plugin in plugin array
-	var flashVer = -1;
-	
-	if (navigator.plugins != null && navigator.plugins.length > 0) {
-		if (navigator.plugins["Shockwave Flash 2.0"] || navigator.plugins["Shockwave Flash"]) {
-			var swVer2 = navigator.plugins["Shockwave Flash 2.0"] ? " 2.0" : "";
-			var flashDescription = navigator.plugins["Shockwave Flash" + swVer2].description;
-			var descArray = flashDescription.split(" ");
-			var tempArrayMajor = descArray[2].split(".");			
-			var versionMajor = tempArrayMajor[0];
-			var versionMinor = tempArrayMajor[1];
-			var versionRevision = descArray[3];
-			if (versionRevision == "") {
-				versionRevision = descArray[4];
-			}
-			if (versionRevision[0] == "d") {
-				versionRevision = versionRevision.substring(1);
-			} else if (versionRevision[0] == "r") {
-				versionRevision = versionRevision.substring(1);
-				if (versionRevision.indexOf("d") > 0) {
-					versionRevision = versionRevision.substring(0, versionRevision.indexOf("d"));
-				}
-			}
-			var flashVer = versionMajor + "." + versionMinor + "." + versionRevision;
-		}
-	}
-	// MSN/WebTV 2.6 supports Flash 4
-	else if (navigator.userAgent.toLowerCase().indexOf("webtv/2.6") != -1) flashVer = 4;
-	// WebTV 2.5 supports Flash 3
-	else if (navigator.userAgent.toLowerCase().indexOf("webtv/2.5") != -1) flashVer = 3;
-	// older WebTV supports Flash 2
-	else if (navigator.userAgent.toLowerCase().indexOf("webtv") != -1) flashVer = 2;
-	else if ( isIE && isWin && !isOpera ) {
-		flashVer = ControlVersion();
-	}	
-	return flashVer;
-}
-
-// When called with reqMajorVer, reqMinorVer, reqRevision returns true if that version or greater is available
-function DetectFlashVer(reqMajorVer, reqMinorVer, reqRevision)
-{
-	versionStr = GetSwfVer();
-	if (versionStr == -1 ) {
-		return false;
-	} else if (versionStr != 0) {
-		if(isIE && isWin && !isOpera) {
-			// Given "WIN 2,0,0,11"
-			tempArray         = versionStr.split(" "); 	// ["WIN", "2,0,0,11"]
-			tempString        = tempArray[1];			// "2,0,0,11"
-			versionArray      = tempString.split(",");	// ['2', '0', '0', '11']
-		} else {
-			versionArray      = versionStr.split(".");
-		}
-		var versionMajor      = versionArray[0];
-		var versionMinor      = versionArray[1];
-		var versionRevision   = versionArray[2];
-
-        	// is the major.revision >= requested major.revision AND the minor version >= requested minor
-		if (versionMajor > parseFloat(reqMajorVer)) {
-			return true;
-		} else if (versionMajor == parseFloat(reqMajorVer)) {
-			if (versionMinor > parseFloat(reqMinorVer))
-				return true;
-			else if (versionMinor == parseFloat(reqMinorVer)) {
-				if (versionRevision >= parseFloat(reqRevision))
-					return true;
-			}
-		}
-		return false;
-	}
-}
-
-function AC_AddExtension(src, ext)
-{
-  if (src.indexOf('?') != -1)
-    return src.replace(/\?/, ext+'?'); 
-  else
-    return src + ext;
-}
-
-function AC_Generateobj(objAttrs, params, embedAttrs) 
-{ 
-    var str = '';
-    if (isIE && isWin && !isOpera)
-    {
-  		str += '<object ';
-  		for (var i in objAttrs)
-  			str += i + '="' + objAttrs[i] + '" ';
-  		str += '>';
-  		for (var i in params)
-  			str += '<param name="' + i + '" value="' + params[i] + '" /> ';
-  		str += '</object>';
-    } else {
-  		str += '<embed ';
-  		for (var i in embedAttrs)
-  			str += i + '="' + embedAttrs[i] + '" ';
-  		str += '> </embed>';
-    }
-
-    document.write(str);
-}
-
-function AC_FL_RunContent(){
-  var ret = 
-    AC_GetArgs
-    (  arguments, ".swf", "movie", "clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"
-     , "application/x-shockwave-flash"
-    );
-  AC_Generateobj(ret.objAttrs, ret.params, ret.embedAttrs);
-}
-
-function AC_GetArgs(args, ext, srcParamName, classid, mimeType){
-  var ret = new Object();
-  ret.embedAttrs = new Object();
-  ret.params = new Object();
-  ret.objAttrs = new Object();
-  for (var i=0; i < args.length; i=i+2){
-    var currArg = args[i].toLowerCase();    
-
-    switch (currArg){	
-      case "classid":
-        break;
-      case "pluginspage":
-        ret.embedAttrs[args[i]] = args[i+1];
-        break;
-      case "src":
-      case "movie":	
-        args[i+1] = AC_AddExtension(args[i+1], ext);
-        ret.embedAttrs["src"] = args[i+1];
-        ret.params[srcParamName] = args[i+1];
-        break;
-      case "onafterupdate":
-      case "onbeforeupdate":
-      case "onblur":
-      case "oncellchange":
-      case "onclick":
-      case "ondblClick":
-      case "ondrag":
-      case "ondragend":
-      case "ondragenter":
-      case "ondragleave":
-      case "ondragover":
-      case "ondrop":
-      case "onfinish":
-      case "onfocus":
-      case "onhelp":
-      case "onmousedown":
-      case "onmouseup":
-      case "onmouseover":
-      case "onmousemove":
-      case "onmouseout":
-      case "onkeypress":
-      case "onkeydown":
-      case "onkeyup":
-      case "onload":
-      case "onlosecapture":
-      case "onpropertychange":
-      case "onreadystatechange":
-      case "onrowsdelete":
-      case "onrowenter":
-      case "onrowexit":
-      case "onrowsinserted":
-      case "onstart":
-      case "onscroll":
-      case "onbeforeeditfocus":
-      case "onactivate":
-      case "onbeforedeactivate":
-      case "ondeactivate":
-      case "type":
-      case "codebase":
-        ret.objAttrs[args[i]] = args[i+1];
-        break;
-      case "id":
-      case "width":
-      case "height":
-      case "align":
-      case "vspace": 
-      case "hspace":
-      case "class":
-      case "title":
-      case "accesskey":
-      case "name":
-      case "tabindex":
-        ret.embedAttrs[args[i]] = ret.objAttrs[args[i]] = args[i+1];
-        break;
-      default:
-        ret.embedAttrs[args[i]] = ret.params[args[i]] = args[i+1];
-    }
-  }
-  ret.objAttrs["classid"] = classid;
-  if (mimeType) ret.embedAttrs["type"] = mimeType;
-  return ret;
-}
-
-
diff --git a/grade/report/visual/flare_visualization/bin-debug/flare_visualization.html b/grade/report/visual/flare_visualization/bin-debug/flare_visualization.html
deleted file mode 100644
index 5570b1f0f7..0000000000
--- a/grade/report/visual/flare_visualization/bin-debug/flare_visualization.html
+++ /dev/null
@@ -1,121 +0,0 @@
-<!-- saved from url=(0014)about:internet -->
-<html lang="en">
-
-<!-- 
-Smart developers always View Source. 
-
-This application was built using Adobe Flex, an open source framework
-for building rich Internet applications that get delivered via the
-Flash Player or to desktops via Adobe AIR. 
-
-Learn more about Flex at http://flex.org 
-// -->
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-
-<!--  BEGIN Browser History required section -->
-<link rel="stylesheet" type="text/css" href="history/history.css" />
-<!--  END Browser History required section -->
-
-<title></title>
-<script src="AC_OETags.js" language="javascript"></script>
-
-<!--  BEGIN Browser History required section -->
-<script src="history/history.js" language="javascript"></script>
-<!--  END Browser History required section -->
-
-<style>
-body { margin: 0px; overflow:hidden }
-</style>
-<script language="JavaScript" type="text/javascript">
-<!--
-// -----------------------------------------------------------------------------
-// Globals
-// Major version of Flash required
-var requiredMajorVersion = 9;
-// Minor version of Flash required
-var requiredMinorVersion = 0;
-// Minor version of Flash required
-var requiredRevision = 28;
-// -----------------------------------------------------------------------------
-// -->
-</script>
-</head>
-
-<body scroll="no">
-<script language="JavaScript" type="text/javascript">
-<!--
-// Version check for the Flash Player that has the ability to start Player Product Install (6.0r65)
-var hasProductInstall = DetectFlashVer(6, 0, 65);
-
-// Version check based upon the values defined in globals
-var hasRequestedVersion = DetectFlashVer(requiredMajorVersion, requiredMinorVersion, requiredRevision);
-
-if ( hasProductInstall && !hasRequestedVersion ) {
-	// DO NOT MODIFY THE FOLLOWING FOUR LINES
-	// Location visited after installation is complete if installation is required
-	var MMPlayerType = (isIE == true) ? "ActiveX" : "PlugIn";
-	var MMredirectURL = window.location;
-    document.title = document.title.slice(0, 47) + " - Flash Player Installation";
-    var MMdoctitle = document.title;
-
-	AC_FL_RunContent(
-		"src", "playerProductInstall",
-		"FlashVars", "MMredirectURL="+MMredirectURL+'&MMplayerType='+MMPlayerType+'&MMdoctitle='+MMdoctitle+"",
-		"width", "800",
-		"height", "600",
-		"align", "middle",
-		"id", "flare_visualization",
-		"quality", "high",
-		"bgcolor", "#ffffff",
-		"name", "flare_visualization",
-		"allowScriptAccess","sameDomain",
-		"type", "application/x-shockwave-flash",
-		"pluginspage", "http://www.adobe.com/go/getflashplayer"
-	);
-} else if (hasRequestedVersion) {
-	// if we've detected an acceptable version
-	// embed the Flash Content SWF when all tests are passed
-	AC_FL_RunContent(
-			"src", "flare_visualization",
-			"width", "800",
-			"height", "600",
-			"align", "middle",
-			"id", "flare_visualization",
-			"quality", "high",
-			"bgcolor", "#ffffff",
-			"name", "flare_visualization",
-			"allowScriptAccess","sameDomain",
-			"type", "application/x-shockwave-flash",
-			"pluginspage", "http://www.adobe.com/go/getflashplayer"
-	);
-  } else {  // flash is too old or we can't detect the plugin
-    var alternateContent = 'Alternate HTML content should be placed here. '
-  	+ 'This content requires the Adobe Flash Player. '
-   	+ '<a href=http://www.adobe.com/go/getflash/>Get Flash</a>';
-    document.write(alternateContent);  // insert non-flash content
-  }
-// -->
-</script>
-<noscript>
-  	<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
-			id="flare_visualization" width="800" height="600"
-			codebase="http://fpdownload.macromedia.com/get/flashplayer/current/swflash.cab">
-			<param name="movie" value="flare_visualization.swf" />
-			<param name="quality" value="high" />
-			<param name="bgcolor" value="#ffffff" />
-			<param name="allowScriptAccess" value="sameDomain" />
-			<embed src="flare_visualization.swf" quality="high" bgcolor="#ffffff"
-				width="800" height="600" name="flare_visualization" align="middle"
-				play="true"
-				loop="false"
-				quality="high"
-				allowScriptAccess="sameDomain"
-				type="application/x-shockwave-flash"
-				pluginspage="http://www.adobe.com/go/getflashplayer">
-			</embed>
-	</object>
-</noscript>
-</body>
-</html>
diff --git a/grade/report/visual/flare_visualization/bin-debug/flare_visualization.swf b/grade/report/visual/flare_visualization/bin-debug/flare_visualization.swf
deleted file mode 100644
index 47cc948d73..0000000000
Binary files a/grade/report/visual/flare_visualization/bin-debug/flare_visualization.swf and /dev/null differ
diff --git a/grade/report/visual/flare_visualization/bin-debug/playerProductInstall.swf b/grade/report/visual/flare_visualization/bin-debug/playerProductInstall.swf
deleted file mode 100644
index bdc3437856..0000000000
Binary files a/grade/report/visual/flare_visualization/bin-debug/playerProductInstall.swf and /dev/null differ
diff --git a/grade/report/visual/flare_visualization/flare/build/flare.animate.swc b/grade/report/visual/flare_visualization/flare/build/flare.animate.swc
deleted file mode 100644
index db59cf4ccf..0000000000
Binary files a/grade/report/visual/flare_visualization/flare/build/flare.animate.swc and /dev/null differ
diff --git a/grade/report/visual/flare_visualization/flare/build/flare.data.swc b/grade/report/visual/flare_visualization/flare/build/flare.data.swc
deleted file mode 100644
index 53a221868e..0000000000
Binary files a/grade/report/visual/flare_visualization/flare/build/flare.data.swc and /dev/null differ
diff --git a/grade/report/visual/flare_visualization/flare/build/flare.demos.swf b/grade/report/visual/flare_visualization/flare/build/flare.demos.swf
deleted file mode 100644
index 7bb49ee945..0000000000
Binary files a/grade/report/visual/flare_visualization/flare/build/flare.demos.swf and /dev/null differ
diff --git a/grade/report/visual/flare_visualization/flare/build/flare.flex.swc b/grade/report/visual/flare_visualization/flare/build/flare.flex.swc
deleted file mode 100644
index 46687d484f..0000000000
Binary files a/grade/report/visual/flare_visualization/flare/build/flare.flex.swc and /dev/null differ
diff --git a/grade/report/visual/flare_visualization/flare/build/flare.physics.swc b/grade/report/visual/flare_visualization/flare/build/flare.physics.swc
deleted file mode 100644
index f97e2861b2..0000000000
Binary files a/grade/report/visual/flare_visualization/flare/build/flare.physics.swc and /dev/null differ
diff --git a/grade/report/visual/flare_visualization/flare/build/flare.query.swc b/grade/report/visual/flare_visualization/flare/build/flare.query.swc
deleted file mode 100644
index bd11e13bc1..0000000000
Binary files a/grade/report/visual/flare_visualization/flare/build/flare.query.swc and /dev/null differ
diff --git a/grade/report/visual/flare_visualization/flare/build/flare.util.swc b/grade/report/visual/flare_visualization/flare/build/flare.util.swc
deleted file mode 100644
index 55be7968d3..0000000000
Binary files a/grade/report/visual/flare_visualization/flare/build/flare.util.swc and /dev/null differ
diff --git a/grade/report/visual/flare_visualization/flare/build/flare.vis.swc b/grade/report/visual/flare_visualization/flare/build/flare.vis.swc
deleted file mode 100644
index fc6f88125d..0000000000
Binary files a/grade/report/visual/flare_visualization/flare/build/flare.vis.swc and /dev/null differ
diff --git a/grade/report/visual/flare_visualization/flare/etc/doc.properties.txt b/grade/report/visual/flare_visualization/flare/etc/doc.properties.txt
deleted file mode 100644
index 8292c4e143..0000000000
--- a/grade/report/visual/flare_visualization/flare/etc/doc.properties.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-# text strings to use in the API documentation
-doc.title=Flare API Documention
-doc.copyright=&#169; 2007-2008 Regents of the University of California
-
-# source folders from which to generate ASDoc documentation
-doc.source=flare.util,flare.animate,flare.physics,flare.query,flare.data,flare.vis,flare.flex
-
-# package-level documentation properties for use in the flare API documention
-doc.flare.animate=The flare.animate package provides classes for creating animated transitions.
-doc.flare.animate.interpolate=The flare.animate.interpolate package provides classes for interpolating object property values.
-doc.flare.data=The flare.data package provides classes for describing and importing external data sets.
-doc.flare.data.converters=The flare.data.converters package provides classes for converting data between external formats and ActionScript objects.
-doc.flare.display=The flare.display package provides classes for display objects that automatically redraw themselves as needed.
-doc.flare.flex=The flare.flex package provides classes for integrating Flare visualizations into Flex applications.
-doc.flare.physics=The flare.physics package provides classes for physical simulations involving particles&#44; springs&#44; and forces.
-doc.flare.query=The flare.query package provides classes for creating and processing SQL-style queries over ActionScript objects.
-doc.flare.query.methods=The flare.query.methods package provides convenience methods for writing queries and expressions.
-doc.flare.util=The flare.util package provides classes for manipulating common data types and accessing object properties in a generalized fashion.
-doc.flare.vis=The flare.vis package provides classes for creating interactive data visualizations.
-doc.flare.vis.axis=The flare.vis.axis package provides classes for presenting and animating axes in a data visualization.
-doc.flare.vis.controls=The flare.vis.controls package provides classes for interacting with data visualizations.
-doc.flare.vis.data=The flare.vis.data package provides classes for visually representing data elements as <code>DataSprite</code> instances.
-doc.flare.vis.data.render=The flare.vis.data.render package provides classes for customized rendering of <code>DataSprite</code> instances.
-doc.flare.vis.events=The flare.vis.events package provides classes for events issued in the flare.vis visualization framework.
-doc.flare.vis.legend=The flare.vis.legend package provides classes for presenting legends for data visualizations.
-doc.flare.vis.operator=The flare.vis.operator package provides classes for visualization operators for encoding and processing visualized data.
-doc.flare.vis.operator.distortion=The flare.vis.operator.distortion package provides classes for distorting the position and size of visualized data.
-doc.flare.vis.operator.filter=The flare.vis.operator.filter package provides classes for visually filtering items by setting their visibility.
-doc.flare.vis.operator.encoder=The flare.vis.operator.encoding package provides classes for visually encoding properties such as color&#44; shape&#44; and size.
-doc.flare.vis.operator.layout=The flare.vis.operator.layout package provides classes for calculating the spatial position of visualized data.
-doc.flare.vis.palette=The flare.vis.palette package provides classes for color&#44; shape&#44; and size palettes for visual encoding.
-doc.flare.vis.scale=The flare.vis.scale package provides classes for data scales such as linear&#44; logarithmic&#44; and ordinal scales.
-doc.flare.vis.util=The flare.vis.util package provides classes with utility functions for filtering and spanning tree generation.
-doc.flare.vis.util.graphics=The flare.vis.util.graphics package provides classes with utility functions for rendering and computational geometry.
-doc.flare.vis.util.heap=The flare.vis.util.heap package provides classes for a heap data structure.
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/etc/flexTasks.jar b/grade/report/visual/flare_visualization/flare/etc/flexTasks.jar
deleted file mode 100644
index 44fc7e8d78..0000000000
Binary files a/grade/report/visual/flare_visualization/flare/etc/flexTasks.jar and /dev/null differ
diff --git a/grade/report/visual/flare_visualization/flare/flare.animate/.actionScriptProperties b/grade/report/visual/flare_visualization/flare/flare.animate/.actionScriptProperties
deleted file mode 100644
index 187abf1144..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.animate/.actionScriptProperties
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<actionScriptProperties mainApplicationPath="flaretween.as" version="3">
-  <compiler additionalCompilerArguments="" copyDependentFiles="false" enableModuleDebug="true" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="false" htmlHistoryManagement="false" htmlPlayerVersion="9.0.28" htmlPlayerVersionCheck="true" outputFolderPath="bin" strict="true" useApolloConfig="false" verifyDigests="true" warn="true">
-    <compilerSourcePath/>
-    <libraryPath defaultLinkType="1">
-      <libraryPathEntry kind="4" path=""/>
-      <libraryPathEntry kind="3" linkType="2" path="/flare.util/bin/flare.util.swc" useDefaultLinkType="false"/>
-    </libraryPath>
-    <sourceAttachmentPath/>
-  </compiler>
-  <applications>
-    <application path="flaretween.as"/>
-  </applications>
-  <modules/>
-  <buildCSSFiles/>
-</actionScriptProperties>
diff --git a/grade/report/visual/flare_visualization/flare/flare.animate/.flexLibProperties b/grade/report/visual/flare_visualization/flare/flare.animate/.flexLibProperties
deleted file mode 100644
index d24096ae7f..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.animate/.flexLibProperties
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<flexLibProperties version="1">
-  <includeClasses>
-    <classEntry path="flare.animate.Easing"/>
-    <classEntry path="flare.animate.Scheduler"/>
-    <classEntry path="flare.animate.Sequence"/>
-    <classEntry path="flare.animate.FunctionSequence"/>
-    <classEntry path="flare.animate.Pause"/>
-    <classEntry path="flare.animate.ISchedulable"/>
-    <classEntry path="flare.animate.interpolate.NumberInterpolator"/>
-    <classEntry path="flare.animate.Tween"/>
-    <classEntry path="flare.animate.interpolate.ColorInterpolator"/>
-    <classEntry path="flare.animate.interpolate.ArrayInterpolator"/>
-    <classEntry path="flare.animate.Transition"/>
-    <classEntry path="flare.animate.Parallel"/>
-    <classEntry path="flare.animate.interpolate.PointInterpolator"/>
-    <classEntry path="flare.animate.interpolate.Interpolator"/>
-    <classEntry path="flare.animate.interpolate.RectangleInterpolator"/>
-    <classEntry path="flare.animate.Transitioner"/>
-  </includeClasses>
-  <includeResources/>
-  <namespaceManifests/>
-</flexLibProperties>
diff --git a/grade/report/visual/flare_visualization/flare/flare.animate/.project b/grade/report/visual/flare_visualization/flare/flare.animate/.project
deleted file mode 100644
index 0506b12ac1..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.animate/.project
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>flare.animate</name>
-	<comment></comment>
-	<projects>
-		<project>flare.util</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.adobe.flexbuilder.project.flexbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.adobe.flexbuilder.project.flexlibnature</nature>
-		<nature>com.adobe.flexbuilder.project.actionscriptnature</nature>
-	</natures>
-</projectDescription>
diff --git a/grade/report/visual/flare_visualization/flare/flare.animate/bin/flare.animate.swc b/grade/report/visual/flare_visualization/flare/flare.animate/bin/flare.animate.swc
deleted file mode 100644
index 5897219b6d..0000000000
Binary files a/grade/report/visual/flare_visualization/flare/flare.animate/bin/flare.animate.swc and /dev/null differ
diff --git a/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/Easing.as b/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/Easing.as
deleted file mode 100644
index c0bd126988..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/Easing.as
+++ /dev/null
@@ -1,424 +0,0 @@
-/*
-Disclaimer for Robert Penner's Easing Equations license:
-
-TERMS OF USE - EASING EQUATIONS
-
-Open source under the BSD License.
-
-Copyright © 2001 Robert Penner
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-    * Neither the name of the author nor the names of contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-package flare.animate
-{
-	/**
-	 * Collection of easing functions to control animation rates.
-	 * The methods of this class are intended to be used either (a) directly as
-	 * values for the <tt>easing</tt> property of <tt>Transition</tt> instances,
-	 * or (b) to generate such easing functions.
-	 * 
-	 * <p>Many of these easing functions are adapted from Robert Penner's
-	 * <a href="http://www.robertpenner.com/">collection of easing functions</a>.
-	 * </p>
-	 */
-	public class Easing
-	{
-		/**
-		 * Constructor, throws an error if called, as this is an abstract class.
-		 */
-		public function Easing() {
-			throw new Error("This is an abstract class.");
-		}
-	
-		// -- Function Generators ---------------------------------------------
-		
-		/**
-		 * Composes any easeIn function with any easeOut function to create a
-		 * custom ease-in/ease-out transition.
-		 * @param fi an ease-in function
-		 * @param fo an ease-out function
-		 * @return the combined ease-in/ease-out function
-		 */		
-		public static function easeInOut(fi:Function, fo:Function):Function {
-			return function(t:Number):Number {
-				if (t < 0.5) return 0.5 * fi(2*t);
-				return 0.5 * (1 + fo(2*t-1));
-			}
-		}
-		
-		/**
-		 * A wrapper that specifies additional arguments to an easing function,
-		 * such that the resulting function can be called with only the time.
-		 * @param f The easing function to wrap
-		 * @param arg A list of arguments. There should only be 1 or 2 arguments.
-		 */
-		public static function delegate(f:Function, ...args):Function {
-			if (args.length == 0 || args.length > 2)
-				throw new ArgumentError("There should only be 1 or 2 extra arguments");
-				
-			return function(t:Number):Number {
-				if (args.length == 1) return f(t,args[0]);
-				return f(t,args[0],args[1]);
-			};
-		}
-		
-		/**
-		 * Easing equation function generator for polynomial easing in: accelerating from zero velocity.
- 		 *
- 		 * @param exp   The exponent of the polynomial (2 for quadration, 3 for cubic, etc)
-		 * @return		An ease-in function using the polynomial x^exp
-		 */
-		public static function easeInPoly(exp:Number):Function {
-			return function(t:Number):Number {
-				if (t < 0)  return 0;
-            	if (t > 1)  return 1;
-            	else return Math.pow(t, exp);
-			}
-		}
-
-		/**
-		 * Easing equation function generator for polynomial easing out: decelerating from zero velocity.
- 		 *
- 		 * @param exp   The exponent of the polynomial (2 for quadration, 3 for cubic, etc)
-		 * @return		An ease-out function using the polynomial x^exp
-		 */		
-		public static function easeOutPoly(exp:Number):Function {
-			return function(t:Number):Number {
-				if (t < 0)  return 0;
-            	if (t > 1)  return 1;
-            	else return 1 - Math.pow(1-t, exp);
-			}
-		}
-		
-		/**
-		 * Easing equation function generator for polynomial easing in/out: acceleration until halfway, then deceleration.
- 		 *
- 		 * @param exp   The exponent of the polynomial (2 for quadration, 3 for cubic, etc)
-		 * @return		An ease-in, ease-out function using the polynomial x^exp
-		 */
-		public static function easeInOutPoly(exp:Number):Function {
-			return function(t:Number):Number {
-				if (t < 0)  return 0;
-            	if (t > 1)  return 1;
-            	if (t < .5) return 0.5 * Math.pow(2*t, exp);
-            	else        return 0.5 * (2 - Math.pow(2*(1-t), exp));
-			}
-		}
-		
-		/**
-		 * Easing equation function generator for polynomial easing out/in: deceleration until halfway, then acceleration.
- 		 *
- 		 * @param exp   The exponent of the polynomial (2 for quadration, 3 for cubic, etc)
-		 * @return		An ease-out, ease-in function using the polynomial x^exp
-		 */
-		public static function easeOutInPoly(exp:Number):Function {
-			var fi:Function = easeInPoly(exp);
-			var fo:Function = easeOutPoly(exp);
-			return function(t:Number):Number {
-				if (t < 0.5) return fo(2*t)/2;
-				else return 0.5 * (1 + fi(2*t-1));
-			}
-		}
-	
-	
-		// -- Static Functions ------------------------------------------------
-	
-		/**
-		 * Easing equation that does nothing, simply returns the input value.
- 		 *
-		 * @param t		Current time (an animation fraction between 0 and 1).
-		 * @return		The correct value.
-		 */
-		public static function none(t:Number):Number {
-			return t;
-		}
-	
-		/**
-		 * Easing equation function for a sinusoidal (sin(t)) easing in: accelerating from zero velocity.
- 		 *
-		 * @param t		Current time (an animation fraction between 0 and 1).
-		 * @return		The correct value.
-		 */
-		public static function easeInSine (t:Number):Number {
-			return 1 - Math.cos(t * (Math.PI/2));
-		}
-	
-		/**
-		 * Easing equation function for a sinusoidal (sin(t)) easing out: decelerating from zero velocity.
- 		 *
-		 * @param t		Current time (an animation fraction between 0 and 1).
-		 * @return		The correct value.
-		 */
-		public static function easeOutSine (t:Number):Number {
-			return Math.sin(t * (Math.PI/2));
-		}
-	
-		/**
-		 * Easing equation function for a sinusoidal (sin(t)) easing in/out: acceleration until halfway, then deceleration.
- 		 *
-		 * @param t		Current time (an animation fraction between 0 and 1).
-		 * @return		The correct value.
-		 */
-		public static function easeInOutSine (t:Number):Number {
-			return -0.5 * (Math.cos(Math.PI*t) - 1);
-		}
-	
-		/**
-		 * Easing equation function for a sinusoidal (sin(t)) easing out/in: deceleration until halfway, then acceleration.
- 		 *
-		 * @param t		Current time (an animation fraction between 0 and 1).
-		 * @return		The correct value.
-		 */
-		public static function easeOutInSine (t:Number):Number {
-			if (t < 0.5) return easeOutSine (t*2);
-			return easeInSine((t*2)-1);
-		}
-	
-		/**
-		 * Easing equation function for an exponential (2^t) easing in: accelerating from zero velocity.
- 		 *
-		 * @param t		Current time (an animation fraction between 0 and 1).
-		 * @return		The correct value.
-		 */
-		public static function easeInExpo (t:Number):Number {
-			return t==0 ? t : Math.pow(2,10*(t-1)) - 0.001;
-		}
-	
-		/**
-		 * Easing equation function for an exponential (2^t) easing out: decelerating from zero velocity.
- 		 *
-		 * @param t		Current time (an animation fraction between 0 and 1).
-		 * @return		The correct value.
-		 */
-		public static function easeOutExpo (t:Number):Number {
-			return (t==1) ? t : 1.001 * (-Math.pow(2, -10*t) + 1);
-		}
-	
-		/**
-		 * Easing equation function for an exponential (2^t) easing in/out: acceleration until halfway, then deceleration.
- 		 *
-		 * @param t		Current time (an animation fraction between 0 and 1).
-		 * @return		The correct value.
-		 */
-		public static function easeInOutExpo (t:Number):Number {
-			if (t==0 || t==1) return t;
-			if (t < 0.5) return 0.5 * Math.pow(2, 10*(2*t-1)) - 0.0005;
-			return 0.5 * 1.0005 * (-Math.pow(2, -10 * (2*t-1)) + 2);
-		}
-	
-		/**
-		 * Easing equation function for an exponential (2^t) easing out/in: deceleration until halfway, then acceleration.
- 		 *
-		 * @param t		Current time (an animation fraction between 0 and 1).
-		 * @return		The correct value.
-		 */
-		public static function easeOutInExpo (t:Number):Number {
-			if (t < 0.5) return 0.5 * easeOutExpo(2*t);
-			return 0.5 * (1 + easeInExpo(2*t-1));
-		}
-	
-		/**
-		 * Easing equation function for a circular (sqrt(1-t^2)) easing in: accelerating from zero velocity.
- 		 *
-		 * @param t		Current time (an animation fraction between 0 and 1).
-		 * @return		The correct value.
-		 */
-		public static function easeInCirc(t:Number):Number {
-			return -(Math.sqrt(1-t*t) - 1);
-		}
-	
-		/**
-		 * Easing equation function for a circular (sqrt(1-t^2)) easing out: decelerating from zero velocity.
- 		 *
-		 * @param t		Current time (an animation fraction between 0 and 1).
-		 * @return		The correct value.
-		 */
-		public static function easeOutCirc(t:Number):Number {
-			return Math.sqrt(1 - (t=t-1)*t);
-		}
-	
-		/**
-		 * Easing equation function for a circular (sqrt(1-t^2)) easing in/out: acceleration until halfway, then deceleration.
- 		 *
-		 * @param t		Current time (an animation fraction between 0 and 1).
-		 * @return		The correct value.
-		 */
-		public static function easeInOutCirc(t:Number):Number {
-			if (t < 0.5) return -0.5 * (Math.sqrt(1 - 4*t*t) - 1);
-			return 0.5 * (Math.sqrt(1 - (t=2*t-2)*t) + 1);
-		}
-	
-		/**
-		 * Easing equation function for a circular (sqrt(1-t^2)) easing out/in: deceleration until halfway, then acceleration.
-		 *
-		 * @param t		Current time (an animation fraction between 0 and 1).
-		 * @return		The correct value.
-		 */
-		public static function easeOutInCirc(t:Number):Number {
-			if (t < 0.5) return easeOutCirc(2*t);
-			return 0.5 * (1 + easeInCirc(2*t-1));
-		}
-	
-		/**
-		 * Easing equation function for an elastic (exponentially decaying sine wave) easing in: accelerating from zero velocity.
-		 *
-		 * @param t		Current time (an animation fraction between 0 and 1).
-		 * @param a		Amplitude.
-		 * @param p		Period.
-		 * @return		The correct value.
-		 */
-		public static function easeInElastic (t:Number, a:Number = Number.NaN, p:Number = Number.NaN):Number {
-			if (t<=0 || t>=1) return t;  if (!p) p=0.45;
-			var s:Number;
-			if (!a || a < Math.abs(1)) { a=1; s=p/4; }
-			else s = p/(2*Math.PI) * Math.asin (1/a);
-			return -(a*Math.pow(2,10*(t-=1)) * Math.sin( (t-s)*(2*Math.PI)/p ));
-		}
-		
-		/**
-		 * Easing equation function for an elastic (exponentially decaying sine wave) easing out: decelerating from zero velocity.
-		 *
-		 * @param t		Current time (an animation fraction between 0 and 1).
-		 * @param a		Amplitude.
-		 * @param p		Period.
-		 * @return		The correct value.
-		 */
-		public static function easeOutElastic (t:Number, a:Number = Number.NaN, p:Number = Number.NaN):Number {
-			return 1 - easeInElastic(1-t, a, p);
-		}
-	
-		/**
-		 * Easing equation function for an elastic (exponentially decaying sine wave) easing in/out: acceleration until halfway, then deceleration.
-		 *
-		 * @param t		Current time (an animation fraction between 0 and 1).
-		 * @param a		Amplitude.
-		 * @param p		Period.
-		 * @return		The correct value.
-		 */
-		public static function easeInOutElastic (t:Number, a:Number = Number.NaN, p:Number = Number.NaN):Number {
-			if (t < 0.5) return 0.5 * easeInElastic(2*t, a, p);
-			return 0.5 * (1 + easeOutElastic(2*t-1, a, p));
-		}
-	
-		/**
-		 * Easing equation function for an elastic (exponentially decaying sine wave) easing out/in: deceleration until halfway, then acceleration.
-		 *
-		 * @param t		Current time (an animation fraction between 0 and 1).
-		 * @param a		Amplitude.
-		 * @param p		Period.
-		 * @return		The correct value.
-		 */
-		public static function easeOutInElastic (t:Number, a:Number = Number.NaN, p:Number = Number.NaN):Number {
-			if (t < 0.5) return 0.5 * easeOutElastic(2*t, a, p);
-			return 0.5 * (1 + easeInElastic(2*t-1, a, p));
-		}
-
-		/**
-		 * Easing equation function for a back (overshooting cubic easing: (s+1)*t^3 - s*t^2) easing in: accelerating from zero velocity.
-		 *
-		 * @param t		Current time (an animation fraction between 0 and 1).
-		 * @param s		Overshoot ammount: higher s means greater overshoot (0 produces cubic easing with no overshoot, and the default value of 1.70158 produces an overshoot of 10 percent).
-		 * @return		The correct value.
-		 */
-		public static function easeInBack (t:Number, s:Number = Number.NaN):Number {
-			if (!s) s = 1.70158;
-			return t*t*((s+1)*t - s);
-		}
-	
-		/**
-		 * Easing equation function for a back (overshooting cubic easing: (s+1)*t^3 - s*t^2) easing out: decelerating from zero velocity.
-		 *
-		 * @param t		Current time (an animation fraction between 0 and 1).
-		 * @param s		Overshoot ammount: higher s means greater overshoot (0 produces cubic easing with no overshoot, and the default value of 1.70158 produces an overshoot of 10 percent).
-		 * @return		The correct value.
-		 */
-		public static function easeOutBack (t:Number, s:Number = Number.NaN):Number {
-			if (!s) s = 1.70158;
-			return 1 - (t=1-t)*t*((s+1)*t - s);
-		}
-	
-		/**
-		 * Easing equation function for a back (overshooting cubic easing: (s+1)*t^3 - s*t^2) easing in/out: acceleration until halfway, then deceleration.
-		 *
-		 * @param t		Current time (an animation fraction between 0 and 1).
-		 * @param s		Overshoot ammount: higher s means greater overshoot (0 produces cubic easing with no overshoot, and the default value of 1.70158 produces an overshoot of 10 percent).
-		 * @return		The correct value.
-		 */
-		public static function easeInOutBack (t:Number, s:Number = Number.NaN):Number {
-			if (!s) s = 1.70158 * 1.525;
-			if (t < 0.5) return 0.5 * easeInBack(2*t, s);
-			return 0.5 * (1 + easeOutBack(2*t-1, s));
-		}
-	
-		/**
-		 * Easing equation function for a back (overshooting cubic easing: (s+1)*t^3 - s*t^2) easing out/in: deceleration until halfway, then acceleration.
-		 *
-		 * @param t		Current time (an animation fraction between 0 and 1).
-		 * @param s		Overshoot ammount: higher s means greater overshoot (0 produces cubic easing with no overshoot, and the default value of 1.70158 produces an overshoot of 10 percent).
-		 * @return		The correct value.
-		 */
-		public static function easeOutInBack (t:Number, s:Number = Number.NaN):Number {
-			if (!s) s = 1.70158 * 1.525;
-			if (t < 0.5) return 0.5 * easeOutBack(2*t, s);
-			return 0.5 * (1 + easeInBack(2*t-1, s));
-		}
-	
-		/**
-		 * Easing equation function for a bounce (exponentially decaying parabolic bounce) easing in: accelerating from zero velocity.
-		 *
-		 * @param t		Current time (an animation fraction between 0 and 1).
-		 * @return		The correct value.
-		 */
-		public static function easeInBounce(t:Number):Number {
-			return 1 - easeOutBounce(1-t);
-		}
-	
-		/**
-		 * Easing equation function for a bounce (exponentially decaying parabolic bounce) easing out: decelerating from zero velocity.
-		 *
-		 * @param t		Current time (an animation fraction between 0 and 1).
-		 * @return		The correct value.
-		 */
-		public static function easeOutBounce (t:Number):Number {
-			if (t < (1/2.75)) {
-				return 7.5625*t*t;
-			} else if (t < (2/2.75)) {
-				return (7.5625*(t-=(1.5/2.75))*t + .75);
-			} else if (t < (2.5/2.75)) {
-				return (7.5625*(t-=(2.25/2.75))*t + .9375);
-			} else {
-				return (7.5625*(t-=(2.625/2.75))*t + .984375);
-			}
-		}
-	
-		/**
-		 * Easing equation function for a bounce (exponentially decaying parabolic bounce) easing in/out: acceleration until halfway, then deceleration.
-		 *
-		 * @param t		Current time (an animation fraction between 0 and 1).
-		 * @return		The correct value.
-		 */
-		public static function easeInOutBounce (t:Number):Number {
-			if (t < 0.5) return 0.5 * easeInBounce(2*t);
-			return 0.5 * (1 + easeOutBounce(2*t-1));
-		}
-	
-		/**
-		 * Easing equation function for a bounce (exponentially decaying parabolic bounce) easing out/in: deceleration until halfway, then acceleration.
-		 *
-		 * @param t		Current time (an animation fraction between 0 and 1).
-		 * @return		The correct value.
-		 */
-		public static function easeOutInBounce (t:Number):Number {
-			if (t < 0.5) return 0.5 * easeOutBounce(2*t);
-			return 0.5 * (1 + easeInBounce(2*t-1));
-		}
-		
-	} // end of class Easing
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/FunctionSequence.as b/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/FunctionSequence.as
deleted file mode 100644
index 3fdd5be9ee..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/FunctionSequence.as
+++ /dev/null
@@ -1,185 +0,0 @@
-package flare.animate
-{
-	import flare.util.Arrays;
-	import flare.util.Maths;
-	
-	/**
-	 * Transition that runs sub-transitions in sequential order while also
-	 * invoking a function before each sub-transition is run. Each function
-	 * must take a Transition instance (often a Transitioner) as input.
-	 * Function sequences can only be played forwards; any attempt to play
-	 * one in reverse will result in an error.
-	 * 
-	 * <p>Function sequences are useful for ensuring a particular function
-	 * is run before a sub-transition begins. For example, the function may
-	 * populate the values of a Transitioner on the fly, or may be used to
-	 * control other variables or side-effects that affect the subsequent
-	 * sub-transition(s).</p>
-	 */
-	public class FunctionSequence extends Sequence
-	{
-		/** @private */
-		protected var _funcs:/*Function*/Array = [];
-		/** @private */
-		protected var _offsetStart:Boolean = true;
-		
-		/** Flag indicating if extra time should be added to the transition to
-		 *  offset the running time of invoked functions. True by default. */
-		public function get offsetStartTime():Boolean { return _offsetStart; }
-		public function set offsetStartTime(b:Boolean):void { _offsetStart = b; }
-		
-		// --------------------------------------------------------------------
-		
-		/**
-		 * Creates a new FunctionSequence transition.
-		 */
-		public function FunctionSequence()
-		{
-			super();
-		}
-		
-		/**
-		 * Adds a function call and corresponding transition to this sequence.
-		 * As the sequence plays, functions will be called at the beginning of
-		 * their subsequence, with the provided transition passed as the
-		 * function's sole argument.
-		 * @param f a function to call at the beginning of a sub-sequence
-		 * @param t the transition to run after the function call. This
-		 *  transition will be passed in as an input to the function.
-		 */
-		public function addFunction(f:Function, t:Transition):void
-		{
-			super.add(t);
-			_funcs.push(f);
-		}
-		
-		/**
-		 * Removes a sub-transition function from this sequence. The
-		 * corresponding transition instance will also be removed.
-		 * @param t the transition to remove
-		 * @return true if the transition was found and removed, false
-		 *  otherwise
-		 */ 
-		public function removeFunction(f:Function):Boolean
-		{
-			if (running) throw new Error("Transition is running!");
-			var idx:int = Arrays.remove(_funcs, f);
-			var rem:Boolean = idx > 0;
-			if (rem) {
-				_trans.splice(idx, 1);
-				_dirty = true;
-			}
-			return rem;
-		}
-		
-		/** @inheritDoc */
-		public override function add(t:Transition):void
-		{
-			super.add(t);
-			_funcs.push(null);
-		}
-		
-		/**
-		 * Removes a sub-transition from this sequence. Any corresponding
-		 * function will also be removed.
-		 * @param t the transition to remove
-		 * @return true if the transition was found and removed, false
-		 *  otherwise
-		 */ 
-		public override function remove(t:Transition):Boolean
-		{
-			if (running) throw new Error("Transition is running!");
-			var idx:int = Arrays.remove(_trans, t);
-			var rem:Boolean = idx > 0;
-			if (rem) {
-				_funcs.splice(idx, 1);
-				_dirty = true;
-			}
-			return rem;
-		}
-		
-		/** @inheritDoc */
-		public override function dispose():void {
-			super.dispose();
-			Arrays.clear(_funcs);
-		}
-	
-		/**
-		 * Plays this function sequence. Function sequences can not be played
-		 * in reverse. 
-		 * @param reverse If true, an error will be thrown and the sequence
-		 *  will not play.
-		 */
-		public override function play(reverse:Boolean=false):void {
-			if (reverse) throw new Error(
-				"Function sequences can't be played in reverse.");
-			super.play(false);
-		}
-		
-		private function invoke(idx:int, t:Transition):void {
-			var f:Function = _funcs[idx];
-			if (f != null) {
-				if (_offsetStart) {
-					var d:Number = new Date().time;
-					f(t);
-					d = new Date().time - d;
-					_start += d;
-				} else {
-					f(t);
-				}
-			}
-		}
-		
-		// --------------------------------------------------------------------
-		
-		/**
-		 * Sets up each sub-transition.
-		 */
-		protected override function setup():void
-		{
-		}
-		
-		/**
-		 * Starts this sequence transition, starting the first sub-transition
-		 * to be played.
-		 */
-		protected override function start():void
-		{
-			if (_trans.length > 0) {
-				var t:Transition = _trans[_idx];
-				invoke(_idx, t); t.doSetup(); t.doStart(false);
-			}
-		}
-		
-		/**
-		 * Steps this sequence transition, ensuring that any sub-transitions
-		 * between the previous and current progress fraction are properly
-		 * invoked.
-		 * @param ef the current progress fraction.
-		 */
-		internal override function step(ef:Number):void
-		{
-			// find the right sub-transition
-			var t:Transition, f0:Number, f1:Number, i:int, inc:int;
-			f0 = _fracs[_idx]; f1 = _fracs[_idx+1]; inc = (ef<=f0 ? -1 : 1);
-			
-			for (i = _idx; i>=0 && i<_trans.length; i+=inc) {
-				// get transition and progress fractions
-				t = _trans[i]; f0 = _fracs[i]; f1 = _fracs[i+1];
-				// hand-off to new transition
-				if (i != _idx) {
-					invoke(i, t); t.doSetup(); t.doStart(false);
-				}
-				if ((inc<0 && ef >= f0) || (inc>0 && ef <= f1)) break;
-				t.doStep(inc<0 ? 0 : 1);
-				t.doEnd();
-			}
-			_idx = i; // set the transition index
-			
-			if (_idx >= 0 && _idx < _trans.length) {
-				// run transition with mapped fraction
-				t.doStep(Maths.invLinearInterp(ef, f0, f1));
-			}
-		}
-	} // end of class FunctionSequence
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/ISchedulable.as b/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/ISchedulable.as
deleted file mode 100644
index 25c9e913e0..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/ISchedulable.as
+++ /dev/null
@@ -1,18 +0,0 @@
-package flare.animate
-{
-	/**
-	 * Interface for "schedulable" objects that can be run by
-	 * the Scheduler class.
-	 */
-	public interface ISchedulable
-	{
-		/**
-		 * Evaluate a scheduled call.
-		 * @param time the current time in milliseconds
-		 * @return true if this item should be removed from the scheduler,
-		 * false if it should continue to be run.
-		 */
-		function evaluate(time:Number) : Boolean;
-		
-	} // end of interface ISchedulable
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/Parallel.as b/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/Parallel.as
deleted file mode 100644
index faf228bcd4..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/Parallel.as
+++ /dev/null
@@ -1,160 +0,0 @@
-package flare.animate
-{
-	import flare.util.Arrays;
-	import flare.util.Maths;
-	
-	/**
-	 * Transition that runs multiple transitions simultaneously (in parallel).
-	 * The duration of this parallel transition is computed as the maximum
-	 * total duration (duration + delay) among the sub-transitions. If the
-	 * duration is explicitly set, the sub-transition lengths will be
-	 * uniformly scaled to fit within the new time span.
-	 */
-	public class Parallel extends Transition
-	{
-		// -- Properties ------------------------------------------------------
-		
-		/** Array of parallel transitions */
-		protected var _trans:/*Transition*/Array = [];
-		/** @private */
-		protected var _equidur:Boolean;
-		/** @private */
-		protected var _dirty:Boolean = false;
-		/** @private */
-		protected var _autodur:Boolean = true;
-
-		/**
-		 * If true, the duration of this sequence is automatically determined
-		 * by the longest sub-transition. This is the default behavior.
-		 */
-		public function get autoDuration():Boolean { return _autodur; }
-		public function set autoDuration(b:Boolean):void {
-			_autodur = b;
-			computeDuration();
-		}
-		
-		/** @inheritDoc */
-		public override function get duration():Number {
-			if (_dirty) computeDuration();
-			return super.duration;
-		}
-		public override function set duration(dur:Number):void {
-			_autodur = false;
-			super.duration = dur;
-			_dirty = true;
-		}
-		
-		// -- Methods ---------------------------------------------------------
-		
-		/**
-		 * Creates a new Parallel transition.
-		 * @param transitions a list of sub-transitions
-		 */
-		public function Parallel(...transitions) {
-			easing = Easing.none;
-			for each (var t:Transition in transitions) {
-				_trans.push(t);
-			}
-			_dirty = true;
-		}
-		
-		/**
-		 * Adds a new sub-transition to this parallel transition.
-		 * @param t the transition to add
-		 */
-		public function add(t:Transition):void {
-			if (running) throw new Error("Transition is running!");
-			_trans.push(t);
-			_dirty = true;
-		}
-		
-		/**
-		 * Removes a sub-transition from this parallel transition.
-		 * @param t the transition to remove
-		 * @return true if the transition was found and removed, false
-		 *  otherwise
-		 */
-		public function remove(t:Transition):Boolean {
-			if (running) throw new Error("Transition is running!");
-			var rem:Boolean = Arrays.remove(_trans, t) >= 0;
-			if (rem) _dirty = true;
-			return rem;
-		}
-		
-		/**
-		 * Computes the duration of this parallel transition.
-		 */
-		protected function computeDuration():void {
-			var d:Number=0, td:Number;
-			if (_trans.length > 0) d = _trans[0].totalDuration;
-			_equidur = true;	
-			for each (var t:Transition in _trans) {
-				td = t.totalDuration;
-				if (_equidur && td != d) _equidur = false;
-				d = Math.max(d, t.totalDuration);
-			}
-			if (_autodur) super.duration = d;
-			_dirty = false;
-		}
-		
-		/** @inheritDoc */
-		public override function dispose():void {
-			while (_trans.length > 0) { _trans.pop().dispose(); }
-		}
-		
-		// -- Transition Handlers ---------------------------------------------
-
-		/** @inheritDoc */
-		public override function play(reverse:Boolean=false):void
-		{
-			if (_dirty) computeDuration();
-			super.play(reverse);
-		}
-
-		/**
-		 * Sets up each sub-transition.
-		 */
-		protected override function setup():void
-		{
-			for each (var t:Transition in _trans) { t.doSetup(); }
-		}
-		
-		/**
-		 * Starts each sub-transition.
-		 */
-		protected override function start():void
-		{
-			for each (var t:Transition in _trans) { t.doStart(_reverse); }
-		}
-		
-		/**
-		 * Steps each sub-transition.
-		 * @param ef the current progress fraction.
-		 */
-		internal override function step(ef:Number):void
-		{
-			var t:Transition;
-			if (_equidur) {
-				// if all durations are the same, we can skip some calculations
-				for each (t in _trans) { t.doStep(ef); }
-			} else {
-				// otherwise, make sure we respect the different lengths
-				var d:Number = duration;
-				for each (t in _trans) {
-					var td:Number = t.totalDuration;
-					var f:Number = d==0 || td==d ? 1 : td/d;
-					t.doStep(ef>f ? 1 : f==1 ? ef : ef/f);
-				}
-			}
-		}
-		
-		/**
-		 * Ends each sub-transition.
-		 */
-		protected override function end():void
-		{
-			for each (var t:Transition in _trans) { t.doEnd(); }
-		}
-		
-	} // end of class Parallel
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/Pause.as b/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/Pause.as
deleted file mode 100644
index 698e978f14..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/Pause.as
+++ /dev/null
@@ -1,18 +0,0 @@
-package flare.animate
-{
-	/**
-	 * Transition representing a pause or dwell in which nothing happens.
-	 * Useful for adding pauses within an animation sequence.
-	 */
-	public class Pause extends Transition
-	{
-		/**
-		 * Creates a new Pause transition with specified duration.
-		 * @param duration the length of the pause, in seconds
-		 */
-		public function Pause(duration:Number) {
-			super(duration);
-		}
-		
-	} // end of class Pause
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/Scheduler.as b/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/Scheduler.as
deleted file mode 100644
index 012148a1b9..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/Scheduler.as
+++ /dev/null
@@ -1,124 +0,0 @@
-package flare.animate
-{
-	import flash.display.Shape;
-	import flash.events.Event;
-	import flash.events.TimerEvent;
-	import flash.utils.Timer;
-	
-	/**
-	 * Scheduler that oversees animation and time-based processing. Uses an
-	 * internal timer to regularly invoke the current set of scheduled
-	 * objects. Typically, interaction with the scheduler is automatically
-	 * handled by Transition classes. However, custom implmentations of
-	 * the ISchedulable interface will need to be scheduled. Use the
-	 * <tt>Scheduler.instance</tt> property, and not the constructor, to get
-	 * a reference to the active scheduler.
-	 * 
-	 * <p>By default, the Scheduler issues updates to all scheduled items each
-	 * time the Flash Player advances to the next frame, as reported by the
-	 * <code>Event.ENTER_FRAME</code> event. To instead set the update interval
-	 * manually, see the <code>timerInterval</code> property.</p>
-	 */
-	public class Scheduler
-	{
-		private static var _scheduler:Scheduler = new Scheduler();
-		/** The default Scheduler instance. */
-		public static function get instance():Scheduler { return _scheduler; }
-		
-		private var _scheduled:Array;
-		private var _timer:Timer;
-		private var _obj:Shape;
-		
-		/**
-		 * Sets the timer interval (in milliseconds) at which the scheduler
-		 * should process events. If this value is greater than zero, a
-		 * <code>Timer</code> instance will be used to trigger scheduler
-		 * updates at the given interval. If this value is less than or equal
-		 * to zero (the default), scheduler updates will be issued with each
-		 * time the Flash Player advances to the next frame according to the
-		 * <code>Event.ENTER_FRAME</code> event.
-		 */
-		public function get timerInterval():Number { return _timer.delay; }
-		public function set timerInterval(t:Number):void {
-			pause(); _timer.delay = (t>0 ? t : 0); play();
-		}
-		
-		/**
-		 * Creates a new Scheduler--this constructor should be not used;
-		 * instead use the <code>instance</code> property.
-		 */
-		public function Scheduler() {
-			_scheduled = new Array();
-			_timer = new Timer(0);
-			_obj = new Shape();
-			
-			_timer.addEventListener(TimerEvent.TIMER, tick);
-		}
-		
-		/**
-		 * Plays the scheduler, allowing it to process events.
-		 */
-		private function play():void
-		{
-			if (timerInterval <= 0) {
-				if (!_obj.hasEventListener(Event.ENTER_FRAME))
-					_obj.addEventListener(Event.ENTER_FRAME, tick);
-			} else if (!_timer.running) {
-				_timer.start();
-			}
-		}
-		
-		/**
-		 * Pauses the scheduler, so that events are not processed.
-		 */
-		private function pause():void
-		{
-			if (timerInterval <= 0) {
-				_obj.removeEventListener(Event.ENTER_FRAME, tick);
-			} else {
-				_timer.stop();
-			}
-		}
-		
-		/**
-		 * Adds an object to the scheduling list.
-		 * @param item a schedulable object to add
-		 */
-		public function add(item:ISchedulable) : void
-		{
-			_scheduled.push(item);
-			play();
-		}
-		
-		/**
-		 * Removes an object from the scheduling list.
-		 * @param item the object to remove
-		 * @return true if the object was found and removed, false otherwise
-		 */
-		public function remove(item:ISchedulable) : Boolean
-		{
-			var idx:uint = _scheduled.indexOf(item);
-			if (idx >= 0) _scheduled.splice(idx,1);
-			return (idx >= 0);
-		}
-		
-		/**
-		 * Frame/timer callback that invokes each scheduled object.
-		 * @param event the event that triggered the callback
-		 */
-		public function tick(event:Event) : void
-        {
-        	// all events will see the same timestamp
-        	var time:Number = new Date().time;
-        	
-        	for each (var s:ISchedulable in _scheduled) {
-        		if (s.evaluate(time))
-        			remove(s);
-        	}
-        	if (_scheduled.length == 0) {
-        		pause();
-        	}
-        }
-        
-	} // end of class Scheduler
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/Sequence.as b/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/Sequence.as
deleted file mode 100644
index 0dee6b0657..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/Sequence.as
+++ /dev/null
@@ -1,192 +0,0 @@
-package flare.animate
-{
-	import flare.util.Arrays;
-	import flare.util.Maths;
-	
-	/**
-	 * Transition that runs multiple transitions one after the other in
-	 * sequence. By default, the total duration of the sequence is the sum of
-	 * the durations and delays of the sub-transitions. If the duration
-	 * of the sequence is set explicitly, the duration and delay for
-	 * sub-transitions will be uniformly scaled to fit within in the new
-	 * time span.
-	 */
-	public class Sequence extends Transition
-	{
-		// -- Properties ------------------------------------------------------
-		
-		/** Array of sequential transitions */
-		protected var _trans:/*Transition*/Array = [];
-		/** @private */
-		protected var _fracs:/*Number*/Array = [];
-		/** @private */
-		protected var _autodur:Boolean = true;
-		/** @private */
-		protected var _dirty:Boolean = false;
-		/** @private */
-		protected var _idx:int = 0;
-		
-		/**
-		 * If true, the duration of this sequence is automatically determined
-		 * by the durations of each sub-transition. This is the default behavior.
-		 */
-		public function get autoDuration():Boolean { return _autodur; }
-		public function set autoDuration(b:Boolean):void {
-			_autodur = b;
-			computeDuration();
-		}
-		
-		/** @inheritDoc */
-		public override function get duration():Number {
-			if (_dirty) computeDuration();
-			return super.duration;
-		}
-		public override function set duration(dur:Number):void {
-			_autodur = false;
-			super.duration = dur;
-			_dirty = true;
-		}
-		
-		// -- Methods ---------------------------------------------------------
-		
-		/**
-		 * Creates a new Sequence transition.
-		 * @param transitions an ordered list of sub-transitions
-		 */
-		public function Sequence(...transitions) {
-			easing = Easing.none;
-			for each (var t:Transition in transitions) {
-				_trans.push(t);
-			}
-			_dirty = true;
-		}
-		
-		/**
-		 * Adds a new transition to the end of this sequence.
-		 * @param t the transition to add
-		 */
-		public function add(t:Transition):void
-		{
-			if (running) throw new Error("Transition is running!");
-			_trans.push(t);
-			_dirty = true;
-		}
-		
-		/**
-		 * Removes a sub-transition from this sequence.
-		 * @param t the transition to remove
-		 * @return true if the transition was found and removed, false
-		 *  otherwise
-		 */ 
-		public function remove(t:Transition):Boolean
-		{
-			if (running) throw new Error("Transition is running!");
-			var rem:Boolean = Arrays.remove(_trans, t) >= 0;
-			if (rem) _dirty = true;
-			return rem;
-		}
-		
-		/**
-		 * Computes the duration of this sequence transition.
-		 */
-		protected function computeDuration():void
-		{
-			var d:Number = 0; _fracs = [0];
-			// collect durations and compute sum
-			for each (var t:Transition in _trans)
-				_fracs.push(d += t.totalDuration);
-			// normalize durations to create progress fractions
-			for (var i:int=1; i<=_trans.length; ++i)
-				_fracs[i] = (d==0 ? 0 : _fracs[i] / d);
-			// set duration and scale
-			if (_autodur) super.duration = d;
-			_dirty = false;
-		}
-		
-		/** @inheritDoc */
-		public override function dispose():void {
-			while (_trans.length > 0) { _trans.pop().dispose(); }
-		}
-		
-		// -- Transition Handlers ---------------------------------------------
-		
-		/** @inheritDoc */
-		public override function play(reverse:Boolean=false):void
-		{
-			if (_dirty) computeDuration();
-			super.play(reverse);
-		}
-		
-		/**
-		 * Sets up each sub-transition.
-		 */
-		protected override function setup():void
-		{
-			// initialize each transition in proper sequence
-			for each (var t:Transition in _trans) {
-				t.doSetup(); t.step(1.0);
-			}
-		}
-		
-		/**
-		 * Starts this sequence transition, starting the first sub-transition
-		 * to be played.
-		 */
-		protected override function start():void
-		{
-			if (_reverse) {
-				// init for reverse playback
-				for (_idx=0; _idx<_trans.length; ++_idx) _trans[_idx].step(1);
-				_idx -= 1;
-			} else {
-				// init for forward playback
-				for (_idx=_trans.length; --_idx>=0;) _trans[_idx].step(0);
-				_idx += 1;
-			}
-			if (_trans.length > 0)
-				_trans[_idx].doStart(_reverse);
-		}
-		
-		/**
-		 * Steps this sequence transition, ensuring that any sub-transitions
-		 * between the previous and current progress fraction are properly
-		 * invoked.
-		 * @param ef the current progress fraction.
-		 */
-		internal override function step(ef:Number):void
-		{
-			// find the right sub-transition
-			var t:Transition, f0:Number, f1:Number, i:int, inc:int;
-			f0 = _fracs[_idx]; f1 = _fracs[_idx+1]; inc = (ef<=f0 ? -1 : 1);
-			
-			for (i = _idx; i>=0 && i<_trans.length; i+=inc) {
-				// get transition and progress fractions
-				t = _trans[i]; f0 = _fracs[i]; f1 = _fracs[i+1];
-				// hand-off to new transition
-				if (i != _idx) t.doStart(_reverse);
-				if ((inc<0 && ef >= f0) || (inc>0 && ef <= f1)) break;
-				t.doStep(inc<0 ? 0 : 1);
-				t.doEnd();
-			}
-			_idx = i; // set the transition index
-			
-			if (_idx >= 0 && _idx < _trans.length) {
-				// run transition with mapped fraction
-				t.doStep(Maths.invLinearInterp(ef, f0, f1));
-			}
-		}
-		
-		/**
-		 * Ends this sequence transition, ending the last transition to be
-		 * played in the sequence as necessary.
-		 */
-		protected override function end():void
-		{
-			if (_idx >= 0 && _idx < _trans.length) {
-				_trans[_idx].doStep(_reverse ? 0 : 1);
-				_trans[_idx].doEnd();
-			}
-		}
-		
-	} // end of class Sequence
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/Transition.as b/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/Transition.as
deleted file mode 100644
index 7b1e9c772f..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/Transition.as
+++ /dev/null
@@ -1,259 +0,0 @@
-package flare.animate
-{
-	import flare.util.Maths;
-		
-	/**
-	 * Base class representing an animated transition. Provides support for
-	 * tracking animation progress over a time duration. The Transition class
-	 * also provides set of callback functions (<tt>onStart</tt>,
-	 * <tt>onStep</tt>, and <tt>onEnd</tt>) that are useful for tracking and
-	 * responding to a transition's progress.
-	 * 
-	 * <p>Useful subclasses of <code>Transition</code> include the
-	 * <code>Tween</code>, <code>Parallel</code>, <code>Sequence</code>,
-	 * <code>Pause</code>, and <code>Transitioner</code> classes.</p>
-	 */
-	public class Transition implements ISchedulable
-	{
-		/** Default easing function: a cubic slow-in slow-out. */
-		public static var DEFAULT_EASING:Function = Easing.easeInOutPoly(3);
-		
-		/** Constant indicating this Transition needs initialization. */
-		protected static const SETUP:int = 0;
-		/** Constant indicating this Transition has been initialized. */
-		protected static const INIT:int = 1;
-		/** Constant indicating this Transition is currently running. */
-		protected static const RUN:int = 2;
-		
-		// -- Properties ------------------------------------------------------
-
-		private var _easing:Function = DEFAULT_EASING; // easing function
-				
-		private var _duration:Number;         // duration, in seconds
-		private var _delay:Number;            // delay, in seconds
-		private var _frac:Number;             // animation fraction
-		private var _state:int = SETUP;       // initialization flag
-		/** @private */
-		protected var _start:Number;          // start time	
-		/** Flag indicating this Transition is currently running. */
-		protected var _running:Boolean = false;
-		/** Flag indicating this Transition is running in reverse. */
-		protected var _reverse:Boolean = false;
-		
-		/** Function called each time this Transition steps. */
-		public var onStep:Function = null;
-		/** Function called when this Transition starts. 
-		 *  Even when playing in reverse, this function is called first. */
-		public var onStart:Function = null;
-		/** Function called when this Transition completes.
-		 *  Even when playing in reverse, this function is called last. */
-		public var onEnd:Function = null;
-		
-		/** The total duration, including both delay and active duration. */
-		public function get totalDuration():Number { return duration + delay; }
-		
-		/** The duration (length) of this Transition, in seconds. */
-		public function get duration():Number { return _duration; }
-		public function set duration(d:Number):void {
-			if (d<0) throw new ArgumentError("Negative duration not allowed.");
-			_duration = d;
-		}
-
-		/** The delay between a call to play and the actual start
-		 *  of the transition, in seconds. */
-		public function get delay():Number { return _delay; }
-		public function set delay(d:Number):void {
-			if (d<0) throw new ArgumentError("Negative delay not allowed.");
-			_delay = d;
-		}
-		
-		/** Fraction between 0 and 1 indicating the current progress
-		 *  of this transition. */
-		public function get progress():Number { return _frac; }
-		internal function set progress(f:Number):void { _frac = f; }
-		
-		/** Easing function used to pace this Transition. */
-		public function get easing():Function { return _easing; }
-		public function set easing(f:Function):void { _easing = f; }
-		
-		/** Indicates if this Transition is currently running. */
-		public function get running():Boolean { return _running; }
-		
-		// -- Methods ---------------------------------------------------------
-		
-		/**
-		 * Creates a new Transition.
-		 * @param duration the duration, in seconds
-		 * @param delay the delay, in seconds
-		 * @param easing the easing function
-		 */
-		public function Transition(duration:Number=1, delay:Number=0,
-								   easing:Function=null)
-		{
-			_duration = duration;
-			_delay = delay;
-			_easing = (easing==null ? DEFAULT_EASING : easing);
-		}
-		
-		/**
-		 * Starts running the transition.
-		 * @param reverse if true, the transition is played in reverse,
-		 *  if false (the default), it is played normally.
-		 */
-		public function play(reverse:Boolean = false):void
-		{
-			_reverse = reverse;
-			init();
-			Scheduler.instance.add(this);
-			_running = true;
-		}
-		
-		/**
-		 * Stops the transition and completes it.
-		 * Any end-of-transition actions will still be taken.
-		 * Calling play() after stop() will result in the transition
-		 * starting over from the beginning.
-		 */
-		public function stop():void
-		{
-			Scheduler.instance.remove(this);
-			doEnd();
-		}
-		
-		/**
-		 * Resets the transition, so that any cached starting values are
-		 * cleared and reset the next time this transition is played.
-		 */
-		public function reset():void
-		{
-			_state = SETUP;
-		}
-		
-		/**
-		 * Pauses the transition at its current position.
-		 * Calling play() after pause() will resume the transition.
-		 */
-		public function pause():void
-		{
-			Scheduler.instance.remove(this);
-			_running = false;
-		}
-		
-		private function init():void
-		{
-			if (_state == SETUP) doSetup();
-			if (_state == RUN) {
-				var f:Number = _reverse ? (1-_frac) : _frac;
-				_start = new Date().time - f * 1000 * (duration + delay);
-			} else {
-				_start = new Date().time;
-				doStart(_reverse);
-			}
-			_state = RUN;
-		}
-
-		internal function doSetup():void
-		{
-			setup();
-			_state = INIT;
-		}
-
-		internal function doStart(reverse:Boolean):void
-		{
-			_reverse = reverse;
-			_running = true;
-			_frac = _reverse ? 1 : 0;
-			start(); if (onStart!=null) onStart();
-		}
-		
-		internal function doStep(frac:Number):void
-		{
-			_frac = frac;
-			var f:Number = delay==0 ? frac
-				 : Maths.invLinearInterp(frac, delay/totalDuration, 1);
-			if (f >= 0) { step(_easing(f)); }
-			if (onStep != null) onStep();
-		}
-		
-		internal function doEnd():void
-		{
-			_frac = _reverse ? 0 : 1;
-			end();
-			_state = INIT;
-			_running = false;
-			if (onEnd!=null) onEnd();
-		}
-		
-		/**
-		 * Evaluates the Transition, stepping the transition forward.
-		 * @param time the current time in milliseconds
-		 * @return true if this item should be removed from the scheduler,
-		 * false if it should continue to be run.
-		 */
-		public function evaluate(time:Number):Boolean
-		{
-			var t:Number = time - _start;
-			if (t < 0) return false;
-			
-			// step the transition forward
-			var d:Number = 1000 * (duration + delay);
-			t = (d==0 ? 1.0 : t/d);
-			if (t > 1) t = 1; // clamp
-			doStep(_reverse ? 1-t : t);
-			
-			// check if we're done
-			var _done:Boolean = (t >= 1.0);
-			if (_done) { doEnd(); }
-			return _done;
-		}
-		
-		/**
-		 * Disposes of this transition, freeing up any resources held. This
-		 * method is optional, but calling it when a transition is no longer
-		 * needed can help improve overall performance.
-		 */
-		public function dispose():void
-		{
-			// for sub-classes to implement
-		}
-		
-		// -- abstract methods ------------------------------------------------
-		
-		/**
-		 * Transition setup routine. Subclasses should override this function
-		 * to perform custom setup actions.
-		 */
-		protected function setup():void
-		{
-			// for sub-classes to implement
-		}
-		
-		/**
-		 * Transition start routine. Subclasses should override this function
-		 * to perform custom start actions.
-		 */
-		protected function start():void
-		{
-			// for sub-classes to implement
-		}
-		
-		/**
-		 * Transition step routine. Subclasses should override this function
-		 * to perform custom step actions.
-		 */
-		internal function step(ef:Number):void
-		{
-			// for sub-classes to implement
-		}
-		
-		/**
-		 * Transition end routine. Subclasses should override this function
-		 * to perform custom ending actions.
-		 */
-		protected function end():void
-		{
-			// for sub-classes to implement
-		}
-		
-	} // end of class Transition
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/Transitioner.as b/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/Transitioner.as
deleted file mode 100644
index 72d732d521..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/Transitioner.as
+++ /dev/null
@@ -1,431 +0,0 @@
-package flare.animate
-{
-	import flare.util.Property;
-	
-	import flash.display.DisplayObject;
-	import flash.utils.Dictionary;
-	
-	/**
-	 * Parallel transition with convenience methods for adding new
-	 * object tweens, helping to incrementally construct a group of transitions.
-	 * A Transitioner will automatically generate tweens for any number of
-	 * items and properties, simplifying the task of creating animated
-	 * transitions. 
-	 * 
-	 * <p>For example, the following code creates a 1 second
-	 * animation for two items. The first item is translated to the point
-	 * (50,50) and the second item is scaled along the x dimension to twice the
-	 * normal size.</p>
-	 * <pre>
-	 * var item1:Sprite, item2:Sprite; // assume these are two drawn sprites
-	 * var t:Transitioner = new Transitioner(1); // create 1-second transition
-	 * t.$(item1).x = 50;
-	 * t.$(item1).y = 50;
-	 * t.$(item2).scaleX = 2;
-	 * t.play();
-	 * </pre>
-	 *
-	 * <p>In the code above, the <code>$</code> method takes an item (this
-	 * can be any ActionScript object, but is often a <code>DisplayObject</code>
-	 * instance) and returns an <code>Object</code> which stores the names of
-	 * the properties to animate and their target values. Behind the scenes,
-	 * the <code>Transitioner</code> automatically creates <code>Tween</code>
-	 * objects as needed.</p>
-	 * 
-	 * <p>The object returned by the <code>$</code> method is a proxy object
-	 * that passes the values to underlying tweens as needed. This same proxy
-	 * object is reused across calls to the <code>$</code> method so do
-	 * <strong>not</strong> attempt to use multiple return values from the
-	 * <code>$</code> method simultaneously. <em>The following example shows
-	 * what you should not do!</em></p>
-	 * <pre>
-	 * var o1:Object = t.$(item1);
-	 * var o2:Object = t.$(item2); // o2==o1, now configured for item2
-	 * o1.x = 5; // actually sets the value 5 to item2, NOT item1
-	 * </pre>
-	 * 
-	 * <p>
-	 * A transitioner can also be set to "immediate" mode, either by setting
-	 * the <code>immediate</code> property to true, or by passing in
-	 * <code>NaN</code> as the duration value to the constructor. When in
-	 * immediate mode, a transitioner will <strong>NOT</strong> generate
-	 * <code>Tween</code> instances to animate the properties. Instead, the
-	 * transitioner will set the values of the target objects immediately.
-	 * For example, when in immediate mode, the <code>$</code> operator is
-	 * equivalent to directly setting the property:
-	 * <code>t.$(item1).x = 50</code> has exactly the same result at
-	 * <code>t.x = 50</code>. The static property
-	 * <code>Transitioner.DEFAULT</code> provides a default instance of an
-	 * immediate-mode transitioner.
-	 * </p>
-	 * 
-	 * <p>
-	 * With these features, transitioners provide a highly flexible way to
-	 * update values in your application. You can write layout and other
-	 * methods once, using a transitioner to update all the property values.
-	 * When animation is desired, a standard transitioner can be passed in
-	 * to your routines. When immediate updates are desired, you can reuse
-	 * the same code, but just pass in a transitioner in immediate mode
-	 * instead. Whether or not value updates are animated or immediate then
-	 * becomes easy to control.
-	 * </p>
-	 * 
-	 * <p>
-	 * Transitioners also provide optimizations to improve animation
-	 * performance. However, they are not enabled by default, as the
-	 * optimizations make some assumptions about how the transitioner will
-	 * be used. See the <code>optimize</code> property and
-	 * <code>dispose</code> method for more information.
-	 * </p>
-	 */
-	public class Transitioner extends Parallel
-	{
-		/** The default, immediate-mode transitioner instance. */
-		public static const DEFAULT:Transitioner = new Transitioner(NaN);
-		
-		/**
-		 * Gets a transitioner instance depending upon the input value.
-		 * @param t input determining the transitioner instance to return. If
-		 *  the input is a transitioner, it is simply returned. If the input is
-		 *  a number, a new Transitioner with duration set to the input value
-		 *  is returned. If the input is null,
-		 *  <code>Transitioner.DEFAULT</code> is returned.
-		 * @return a Transitioner instance determined by the input
-		 */		
-		public static function instance(t:*):Transitioner {
-			if (t is Number) {
-				return new Transitioner(t as Number);
-			} else if (t == null) {
-				return Transitioner.DEFAULT;
-			} else {
-				return t as Transitioner;
-			}
-		}
-		
-		// --------------------------------------------------------------------
-		
-		private var _immediate:Boolean;
-		private var _lookup:/*Object->Tween*/Dictionary = new Dictionary();
-		
-		private var _proxy:ValueProxy;
-		private var _optimize:Boolean = false;
-		private var _subdur:Number;
-		
-		/** @private */
-		public override function get duration():Number {
-			return _trans.length==0 ? _subdur : super.duration;
-		}
-		
-		/** Immediate mode flag, used to bypass tween generation and perform
-		 *  immediate updates of target object values. */
-		public function get immediate():Boolean { return _immediate; }
-		public function set immediate(b:Boolean):void {
-			_immediate = b;
-			if (!immediate && _proxy == null) _proxy = new ValueProxy(this);
-		}
-		
-		/** 
-		 * Flag indicating if aggressive optimization should be applied.
-		 * This can significantly decrease processing time when large numbers
-		 * of elements are involved. However, the optimization process makes a
-		 * few assumptions about how the transitioner will be used. If these
-		 * assumptions are not met, the animations may exhibit unexpected
-		 * behaviors.
-		 * 
-		 * <p>The assumptions made for optimized transitioners are:
-		 * <ol>
-		 * <li>The property values of tweened objects will not change between
-		 *     the time their target values are set and the transition is
-		 *     played. This allows the transitioner to avoid creating tweens
-		 *     when properties have the same starting and ending values, and
-		 *     immediately set values for DisplayObjects that are not visible.
-		 *     However, this means the starting value must stay the same. In
-		 *     particular, this means that optimized transitioners are often
-		 *     inappropriate for use within a <code>Sequence</code>.</li>
-		 * <li>The transitioner will only be played once, then discarded.
-		 *     This allows the transitioner to automatically recycle all 
-		 *     generated <code>Tween</code> and <code>Interpolator</code>
-		 *     instances, reducing initialization time across transitioners by
-		 *     reusing objects.</li>
-		 * </ol>
-		 * </p>
-		 */
-		public function get optimize():Boolean { return _optimize; }
-		public function set optimize(b:Boolean):void { _optimize = b; }
-		
-		// --------------------------------------------------------------------
-		
-		/**
-		 * Creates a new Transitioner with specified duration.
-		 * @param duration the length of the transition. If this value is NaN,
-		 *  the transitioner will be in immediate mode, in which all changes
-		 *  are immediately applied and no tweens are generated.
-		 * @param easing the easing function to use for this transition. If
-		 *  null, the function Easing.none will be used.
-		 * @param optimize boolean flag indicating if the transitioner should
-		 *  attempt to optimize tween construction. See the documentation
-		 *  for the <code>optimize</code> property for mode details.
-		 */
-		public function Transitioner(duration:Number=1, easing:Function=null,
-									 optimize:Boolean=false)
-		{
-			super.easing = easing==null ? DEFAULT_EASING : easing;
-			_subdur = duration;
-			_optimize = optimize;
-			_immediate = isNaN(duration);
-			if (!_immediate) _proxy = new ValueProxy(this);
-		}
-		
-		/**
-		 * Returns the Tween for the given object, creating a new tween if no
-		 * tween is yet associated with the object. This method returns null if
-		 * the transitioner is in immediate mode.
-		 * @param o the target object
-		 * @return a tween for the input target object, or null if this
-		 *  transitioner is in immediate mode.
-		 */
-		public function _(o:Object):Tween
-		{
-			if (_immediate) return null;
-			
-			var tw:Tween = _lookup[o];
-			if (tw == null) {
-				add(tw = getTween(o, _subdur));
-				tw.easing = Easing.none;
-				_lookup[o] = tw;
-			}
-			return tw;
-		}
-		
-		/**
-		 * Returns the values object of the Tween for the given object. If no
-		 * tween is associated with the object, a new one is created.
-		 * 
-		 * If the transitioner is in immediate mode, then no Tween will be
-		 * created. Instead, the input object will be returned. This allows
-		 * value updates to be set immediately, rather than animated by a
-		 * tween.
-		 * @param o the target object
-		 * @return the <code>values</code> object for the target object's
-		 *  tween, or the target object itself if this transitioner is in
-		 *  immediate mode.
-		 */
-		public function $(o:Object):Object
-		{
-			return _immediate ? o : _proxy.init(o);
-		}
-		
-		/**
-		 * Sets property values for a target object. This method has the same
-		 * effect as setting a property on the object returned by the
-		 * <code>$</code> method.
-		 * 
-		 * <p>If the transitioner is in immediate mode, the property name will
-		 * be parsed and the value set at the end of the property chain. If
-		 * the transitioner is not in immediate mode, the property name and
-		 * values will simply be added to a Tween. If no Tween is associated
-		 * with the input object, a new one will be created.</p>
-		 * 
-		 * @param o the target object
-		 * @param name the property name string
-		 * @param value the property value to set
-		 */
-		public function setValue(o:Object, name:String, value:*):void
-		{
-			if (_immediate) {
-				// set the object property
-				Property.$(name).setValue(o, value);
-			} else if (optimize && getValue(o, name) == value) {
-				// do nothing, optimize the call away...
-			} else if (optimize && o is DisplayObject && !o.visible) {
-				Property.$(name).setValue(o, value);
-			} else {
-				// add to a tween
-				_(o).values[name] = value;
-			}
-		}
-		
-		/**
-		 * Retrieves property values for a target object. This method has the
-		 * same effect as accessing a property using the object returned by the
-		 * <code>$</code> method.
-		 * 
-		 * <p>If the transitioner is in immediate mode, the property name will
-		 * be parsed and the value retrieved diretly from the target object. If
-		 * the transitioner is not in immediate mode, this method will first
-		 * try to lookup the value in the tween <code>values</code> for the
-		 * target object. If this does not succeed, the property value will be
-		 * retrieved directly from the target object itself as in the immediate
-		 * mode case.</p>
-		 * 
-		 * @param o the target object
-		 * @param name the property name string
-		 * @return the property value for the target object, either from the
-		 *  target object's tween values, or, failing that, the object itself.
-		 */
-		public function getValue(o:Object, name:String):*
-		{
-			if (!_immediate) {
-				var tw:Tween = _lookup[o];
-				if (tw != null && tw.values[name] != undefined) {
-					return tw.values[name];
-				}
-			}
-			return Property.$(name).getValue(o);
-		}
-		
-		/**
-		 * Sets the delay of the tween for the given object. If the
-		 * transitioner is in immediate mode, this method has no effect.
-		 * @param o the object to set the delay for
-		 * @param delay the delay, in seconds
-		 */		
-		public function setDelay(o:Object, delay:Number):void
-		{
-			if (!_immediate) {
-				_(o).delay = delay;
-			}
-		}
-				
-		/**
-		 * Gets the delay of the tween for the given object. If the
-		 * transitioner is in immediate mode or no tween has been created for
-		 * the input object, this method returns zero.
-		 * @param o the object to get the delay for
-		 * @return the delay of the tween, or zero if there is no tween
-		 */
-		public function getDelay(o:Object):Number
-		{
-			if (_immediate) return 0;
-			var tw:Tween = _lookup[o];
-			return tw==null ? 0 : tw.delay;
-		}
-		
-		/**
-		 * Sets the removal status of a display object with this transition.
-		 * If true, the display object will be removed from its parent in the
-		 * display list when the transition completes. If this transitioner is
-		 * in immediate mode, any removals are performed immediately.
-		 * @param dobj a display object
-		 * @param b true to remove the display object from the display list
-		 *  at the end of the transition (the default). If false, the removal
-		 *  status will be updated so that the display object will not be
-		 *  removed (not applicable in immediate mode).
-		 */		
-		public function removeChild(dobj:DisplayObject, b:Boolean=true):void
-		{
-			if (_immediate && b) {
-				if (dobj.parent) dobj.parent.removeChild(dobj);
-			} else if (!_immediate) {
-				_(dobj).remove = b;
-			}
-		}
-		
-		/**
-		 * Indicates if a display object is scheduled to be removed from the
-		 * display list when this transition completes. This method always
-		 * returns false if this transitioner is in immediate mode.
-		 * @param dobj a display object
-		 * @return true if the display object will be removed from the display
-		 *  list at the end of this transition, false otherwise. This method
-		 *  always returns false if the transitioner is in immediate mode.
-		 */
-		public function willRemove(dobj:DisplayObject):Boolean
-		{
-			if (_immediate) return false;
-			var tw:Tween = _lookup[dobj];
-			return (tw != null && tw.remove);
-		}
-		
-		/** @inheritDoc */
-		protected override function end():void
-		{
-			super.end();
-			if (_optimize) dispose();
-		}
-		
-		/**
-		 * Disposes of the internal state of this transitioner.
-		 * Contained tweens and their interpolators will be collected and
-		 * recycled for future reuse, improving initialization times for
-		 * subsequent transitioners. This method is automatically called at the
-		 * end of the transition if the <code>optimize</code> flag is true.
-		 * Otherwise, this method can be invoked manually when a transitioner
-		 * is no longer needed.
-		 */
-		public override function dispose():void
-		{
-			while (_trans.length > 0) {
-				var t:Transition = _trans.pop();
-				t.dispose();
-				if (t is Tween) reclaimTween(t as Tween);
-			}
-		}
-		
-		// --------------------------------------------------------------------
-		
-		private static var _maxPoolSize:int = 10000;
-		private static var _tweenPool:Array = [];
-		private static var _count:int = 0;
-		
-		private static function getTween(o:Object, duration:Number):Tween
-		{
-			var tw:Tween;
-			if (_tweenPool.length > 0) {
-				tw = _tweenPool.pop();
-				tw.target = o;
-				tw.duration = duration;
-			} else {
-				tw = new Tween(o, duration);
-			}
-			return tw;
-		}
-		
-		private static function reclaimTween(tw:Tween):void
-		{
-			if (_tweenPool.length < _maxPoolSize) {
-				_tweenPool.push(tw);
-			}
-		}
-		
-	} // end of class Transitioner
-}
-
-import flash.utils.Proxy;
-import flash.utils.flash_proxy;
-import flare.animate.Transitioner;
-import flare.util.Property;
-
-/**
- * Helper class that gets/sets values for a Transitioner.
- * This layer of indirection allows us to perform "behind-the-scenes"
- * handling while maintaining simple property assignment syntax.
- */
-dynamic class ValueProxy extends Proxy
-{
-	private var _trans:Transitioner;
-	private var _object:Object;
-    
-    public function ValueProxy(trans:Transitioner) {
-    	_trans = trans;
-    }
-
-	public function init(obj:Object):Object
-	{
-		_object = obj;
-		return this;
-	}
-
-	override flash_proxy function callProperty(methodName:*, ... args):* {
-		return null;
-	}
-
-    override flash_proxy function getProperty(name:*):* {
-    	return _trans.getValue(_object, name);
-    }
-
-    override flash_proxy function setProperty(name:*, value:*):void {
-        _trans.setValue(_object, name, value);
-    }
-    
-} // end of class ValueProxy
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/Tween.as b/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/Tween.as
deleted file mode 100644
index 831dd3c365..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/Tween.as
+++ /dev/null
@@ -1,175 +0,0 @@
-package flare.animate
-{
-	import flare.animate.interpolate.Interpolator;
-	import flare.util.Property;
-	
-	import flash.display.DisplayObject;
-	
-	/**
-	 * Transition that interpolates (in-be<em>tweens</em>) properties
-	 * of a target object over a time interval. The <tt>values</tt> property
-	 * represents the set of properties to tween and their final values. Any
-	 * arbitrary property (not just visual properties) can be tweened. The
-	 * Tween class handles tweening of Numbers, colors, Dates, Points,
-	 * Rectangles, and numeric Arrays. Properties of other types are simply
-	 * swapped when then Transition half-completes. Tweening for custom types
-	 * is possible, see the <tt>flare.animate.interpolate.Interpolator</tt>
-	 * class for more.
-	 * 
-	 * <p>Starting values are automatically determined from the tweened object.
-	 * Once determined, these starting values are stored to allow both forward
-	 * and backward playback. Use the <tt>reset</tt> method to force a tween to
-	 * redetermine the starting values the next time it is played. Tweens also
-	 * provide a <code>remove</code> flag for DisplayObjects. When set to true,
-	 * a display object will be removed from the display list at the end of the
-	 * tween. Note that playing the tween is reverse will not revert this
-	 * removal.</p>
-	 * 
-	 * <p>Internally, a Tween creates a set of Interpolator objects to compute
-	 * intermediate values for each property included in <tt>values</tt>. Note
-	 * that property names can involve nested properties. For example,
-	 * <tt>{"filters[0].blurX":5}</tt> is a valid tweening property, as both
-	 * array access (<tt>[]</tt>) and property access (<tt>.</tt>) syntax are
-	 * supported.</p>
-	 * 
-	 * <p>To manage a collection of objects being tweened simultaneously, use a
-	 * <tt>Transitioner</tt> object.</p>
-	 */
-	public class Tween extends Transition
-	{
-		// -- Properties ------------------------------------------------------
-		
-		private var _interps:Array = new Array();
-		private var _target:Object;
-		private var _from:Object;
-		private var _remove:Boolean = false;
-		private var _visible:Boolean = true;
-		private var _values:Object;
-		
-		/** The target object whose properties are tweened. */
-		public function get target():Object { return _target; }
-		public function set target(t:Object):void { _target = t; }
-		
-		/** Flag indicating if the target object should be removed from the
-		 *  display list at the end of the tween. Only applies when the target
-		 *  is a <code>DisplayObject</code>. */
-		public function get remove():Boolean { return _remove; }
-		public function set remove(b:Boolean):void { _remove = b; }
-		
-		/** The properties to tween and their target values. */
-		public function get values():Object { return _values; }
-		public function set values(o:Object):void { _values = o; }
-		
-		/** Optional starting values for tweened properties. */
-		public function get from():Object { return _from; }
-		public function set from(s:Object):void { _from = s; }
-		
-		
-		// - Methods ----------------------------------------------------------
-		
-		/**
-		 * Creates a new Tween with the specified parameters.
-		 * @param target the target object
-		 * @param duration the duration of the tween, in seconds
-		 * @param values the properties to tween and their target values
-		 * @param remove a display list removal flag (for
-		 *  <code>DisplayObject</code> target objects
-		 * @param easing the easing function to use
-		 */
-		public function Tween(target:Object, duration:Number=1,
-			values:Object=null, remove:Boolean=false, easing:Function=null)
-		{
-			super(duration, 0, easing);
-			
-			_target = target;
-			_remove = remove;
-			_values = values==null ? {} : values;
-			_from = {};
-		}
-		
-		/** @inheritDoc */
-		public override function dispose():void
-		{
-			// reclaim any old interpolators
-			while (_interps.length > 0) {
-				Interpolator.reclaim(_interps.pop());
-			}
-			// remove all target values
-			for (var name:String in _values) {
-				delete _values[name];
-			}
-			_visible = true;
-			_remove = false;
-			_target = null;
-		}
-		
-		/**
-		 * Sets up this tween by creating interpolators for each tweened
-		 * property.
-		 */
-		protected override function setup():void
-		{
-			// reclaim any old interpolators
-			while (_interps.length > 0) {
-				Interpolator.reclaim(_interps.pop());
-			}
-			
-			// build interpolators
-			var vc:Object, v0:Object, v1:Object;
-			for (var name:String in _values) {
-				// create interpolator only if start/cur/end values don't match
-				vc = Property.$(name).getValue(_target);
-				v0 = _start.hasOwnProperty(name) ? _from[name] : vc;
-				v1 = _values[name];
-				
-				if (vc != v1 || vc != v0) {
-					if (name == "visible") {
-						// special handling for visibility
-						_visible = Boolean(v1);
-					} else {
-						_interps.push(Interpolator.create(_target, name, v0, v1));
-					}
-				}
-			}
-		}
-		
-		/**
-		 * Updates target object visibility, if appropriate.
-		 */
-		protected override function start():void
-		{
-			// set visibility
-			var item:DisplayObject = _target as DisplayObject;
-			if (item != null && _visible) {
-				item.visible = _visible;
-			}
-		}
-		
-		/**
-		 * Steps the tween, updating the tweened properties.
-		 */
-		internal override function step(ef:Number):void
-		{
-			// run the interpolators
-			for each (var i:Interpolator in _interps) {
-				i.interpolate(ef);
-			}
-		}
-		
-		/**
-		 * Ends the tween, updating target object visibility and display
-		 * list membership, if appropriate.
-		 */
-		protected override function end():void
-		{
-			// set visibility, remove from display list if requested
-			var item:DisplayObject = _target as DisplayObject;
-			if (item != null) {
-				if (_remove && item.parent != null)
-					item.parent.removeChild(item);
-				item.visible = _visible;
-			}
-		}
-		
-	} // end of class Tween
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/interpolate/ArrayInterpolator.as b/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/interpolate/ArrayInterpolator.as
deleted file mode 100644
index 3e1208ad3d..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/interpolate/ArrayInterpolator.as
+++ /dev/null
@@ -1,65 +0,0 @@
-package flare.animate.interpolate
-{
-	import flare.util.Arrays;
-	
-	/**
-	 * Interpolator for numeric <code>Array</code> values. Each value
-	 * contained in the array should be a numeric (<code>Number</code> or
-	 * <code>int</code>) value.
-	 */
-	public class ArrayInterpolator extends Interpolator
-	{
-		private var _start:Array;
-		private var _end:Array;
-		private var _cur:Array;
-		
-		/**
-		 * Creates a new ArrayInterpolator.
-		 * @param target the object whose property is being interpolated
-		 * @param property the property to interpolate
-		 * @param start the starting array of values to interpolate from
-		 * @param end the target array to interpolate to. This should be an
-		 *  array of numerical values.
-		 */
-		public function ArrayInterpolator(target:Object, property:String,
-		                                  start:Object, end:Object)
-		{
-			super(target, property, start, end);
-		}
-		
-		/**
-		 * Initializes this interpolator.
-		 * @param start the starting value of the interpolation
-		 * @param end the target value of the interpolation
-		 */
-		protected override function init(start:Object, end:Object) : void
-		{
-			_start = start as Array;
-			_end = end as Array;
-			
-			if (!_end) throw new Error("Target array is null!");
-			if (!_start) _start = Arrays.copy(_end);
-			if (_start.length != _end.length)
-				throw new Error("Array dimensions don't match");
-			
-			if (_cur == null || _cur == _start || _cur == _end) {
-				_cur = Arrays.copy(_start);
-			} else {
-				_cur = Arrays.copy(_start, _cur);
-			}
-		}
-		
-		/**
-		 * Calculate and set an interpolated property value.
-		 * @param f the interpolation fraction (typically between 0 and 1)
-		 */
-		public override function interpolate(f:Number) : void
-		{
-			for (var i:uint=0; i<_cur.length; ++i) {
-				_cur[i] = _start[i] + f*(_end[i] - _start[i]);
-			}
-			_prop.setValue(_target, _cur);
-		}
-		
-	} // end of class ArrayInterpolator
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/interpolate/ColorInterpolator.as b/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/interpolate/ColorInterpolator.as
deleted file mode 100644
index 171c78e285..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/interpolate/ColorInterpolator.as
+++ /dev/null
@@ -1,65 +0,0 @@
-package flare.animate.interpolate
-{	
-	/**
-	 * Interpolator for color (<code>uint</code>) values.
-	 */ 
-	public class ColorInterpolator extends Interpolator
-	{
-		private var _start:uint;
-		private var _end:uint;
-		
-		/**
-		 * Creates a new ColorInterpolator.
-		 * @param target the object whose property is being interpolated
-		 * @param property the property to interpolate
-		 * @param start the starting color value to interpolate from
-		 * @param end the target color value to interpolate to
-		 */
-		public function ColorInterpolator(target:Object, property:String,
-		                                  start:Object, end:Object)
-		{
-			super(target, property, start, end);
-		}
-		
-		/**
-		 * Initializes this interpolator.
-		 * @param start the starting value of the interpolation
-		 * @param end the target value of the interpolation
-		 */
-		protected override function init(start:Object, end:Object) : void
-		{
-			_start = uint(start);
-			_end = uint(end);
-		}
-		
-		/**
-		 * Calculate and set an interpolated property value.
-		 * @param f the interpolation fraction (typically between 0 and 1)
-		 */
-		public override function interpolate(f:Number) : void
-		{
-			// we'll do all the work here to avoid the overhead of
-			//  extra method calls (rather than call Colors.interpolate)
-			var a1:uint, a2:uint, r1:uint, r2:uint, 
-			    g1:uint, g2:uint, b1:uint, b2:uint;
-			
-			// get color components
-			a1 = (_start >> 24) & 0xFF; a2 = (_end >> 24) & 0xFF;
-			r1 = (_start >> 16) & 0xFF; r2 = (_end >> 16) & 0xFF;
-			g1 = (_start >>  8) & 0xFF; g2 = (_end >>  8) & 0xFF;
-			b1 =  _start & 0xff;        b2 =  _end & 0xFF;
-			
-			// interpolate the color components
-			a1 += f*(a2-a1); r1 += f*(r2-r1);
-			g1 += f*(g2-g1); b1 += f*(b2-b1);
-			
-			// recombine into final color
-			a1 = ((a1 & 0xFF) << 24) | ((r1 & 0xFF) << 16) |
-				 ((g1 & 0xFF) <<  8) |  (b1 & 0xFF);
-			
-			// update the property value
-			_prop.setValue(_target, a1);
-		}
-		
-	} // end of class ColorInterpolator
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/interpolate/DateInterpolator.as b/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/interpolate/DateInterpolator.as
deleted file mode 100644
index 1d9377485d..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/interpolate/DateInterpolator.as
+++ /dev/null
@@ -1,48 +0,0 @@
-package flare.animate.interpolate
-{
-	/**
-	 * Interpolator for <code>Date</code> values.
-	 */
-	public class DateInterpolator extends Interpolator
-	{
-		private var _start:Number;
-		private var _end:Number;
-		private var _d:Date;
-		
-		/**
-		 * Creates a new DateInterpolator.
-		 * @param target the object whose property is being interpolated
-		 * @param property the property to interpolate
-		 * @param start the starting date value to interpolate from
-		 * @param end the target date value to interpolate to
-		 */
-		public function DateInterpolator(target:Object, property:String,
-		                                 start:Object, end:Object)
-		{
-			super(target, property, start, end);
-		}
-		
-		/**
-		 * Initializes this interpolator.
-		 * @param start the starting value of the interpolation
-		 * @param end the target value of the interpolation
-		 */
-		protected override function init(start:Object, end:Object) : void
-		{
-			_d = new Date();
-			_start = (start as Date).time;
-			_end = (end as Date).time - _start;
-		}
-		
-		/**
-		 * Calculate and set an interpolated property value.
-		 * @param f the interpolation fraction (typically between 0 and 1)
-		 */
-		public override function interpolate(f:Number) : void
-		{
-			_d.time = _start + f * _end;
-			_prop.setValue(_target, _d);
-		}
-		
-	} // end of class DateInterpolator
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/interpolate/Interpolator.as b/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/interpolate/Interpolator.as
deleted file mode 100644
index 346e88d0fe..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/interpolate/Interpolator.as
+++ /dev/null
@@ -1,251 +0,0 @@
-package flare.animate.interpolate
-{
-	import flare.util.Property;
-	
-	import flash.utils.getDefinitionByName;
-	import flash.utils.getQualifiedClassName;
-	
-	/**
-	 * Base class for value interpolators. This class also provides factory 
-	 * methods for creating concrete interpolator instances -- see the
-	 * <code>create</code> method for details about interpolator creation.
-	 */
-	public class Interpolator
-	{
-		/** The target object whose property is being interpolated. */
-		protected var _target:Object;
-		/** The property to interpolate. */
-		protected var _prop:Property;
-		
-		/**
-		 * Base constructor for Interpolator instances.
-		 * @param target the object whose property is being interpolated
-		 * @param property the property to interpolate
-		 * @param value the target value of the interpolation
-		 */
-		public function Interpolator(target:Object, property:String,
-									 start:Object, end:Object)
-		{
-			reset(target, property, start, end);
-		}
-		
-		/**
-		 * Re-initializes an exising interpolator instance.
-		 * @param target the object whose property is being interpolated
-		 * @param property the property to interpolate
-		 * @param value the target value of the interpolation
-		 */
-		public function reset(target:Object, property:String,
-		                      start:Object, end:Object):void
-		{
-			_target = target;
-			_prop = Property.$(property);
-			init(start, end);
-		}
-		
-		/**
-		 * Performs initialization of an interpolator, typically by
-		 * initializing the start and ending values. Subclasses should
-		 * override this method for custom initialization.
-		 * @param value the target value of the interpolation
-		 */
-		protected function init(start:Object, end:Object) : void
-		{
-			// for subclasses to override
-		}
-		
-		/**
-		 * Calculate and set an interpolated property value. Subclasses should
-		 * override this method to implement custom interpolation routines.
-		 * @param f the interpolation fraction (typically between 0 and 1)
-		 */
-		public function interpolate(f:Number) : void
-		{
-			throw new Error("This is an abstract method");
-		}
-		
-		// -- Interpolator Factory --------------------------------------------
-		
-		private static var _maxPoolSize:int = 10000;
-		private static var _pools:Object = [];
-		private static var _lookup:Object = buildLookupTable();
-		private static var _rules:Array = buildRules();
-		
-		private static function buildLookupTable() : Object
-		{			
-			// add variables to ensure classes are included by compiler
-			var ni:NumberInterpolator;
-			var di:DateInterpolator;
-			var pi:PointInterpolator;
-			var ri:RectangleInterpolator;
-			var mi:MatrixInterpolator;
-			var ai:ArrayInterpolator;
-			var ci:ColorInterpolator;
-			var oi:ObjectInterpolator;
-			
-			// build the value->interpolator lookup table
-			var lut:Object = new Object();
-			lut["Number"] = "flare.animate.interpolate::NumberInterpolator";
-			lut["int"] = "flare.animate.interpolate::NumberInterpolator";
-			lut["Date"] = "flare.animate.interpolate::DateInterpolator";
-			lut["Array"] = "flare.animate.interpolate::ArrayInterpolator";
-			lut["flash.geom::Point"] = "flare.animate.interpolate::PointInterpolator";
-			lut["flash.geom::Rectangle"] = "flare.animate.interpolate::RectangleInterpolator";
-			lut["flash.geom::Matrix"] = "flare.animate.interpolate::MatrixInterpolator";
-			return lut;
-		}
-		
-		private static function buildRules() : Array
-		{
-			var rules:Array = new Array();
-			rules.push(isColor);
-			rules.push(isShape);
-			return rules;
-		}
-		
-		private static function isColor(target:Object, property:String, s:Object, e:Object)
-			: String
-		{
-			return property.indexOf("Color")>=0 || property.indexOf("color")>=0
-				? "flare.animate.interpolate::ColorInterpolator"
-				: null;
-		}
-		
-		private static function isShape(target:Object, property:String, s:Object, e:Object)
-			: String
-		{
-			return property == "shape"
-				? "flare.animate.interpolate::ObjectInterpolator"
-				: null;
-		}
-		
-		/**
-		 * Extends the interpolator factory with a new interpolator type.
-		 * @param valueType the fully qualified class name for the object type
-		 *  to interpolate
-		 * @param interpType the fully qualified class name for the
-		 *  interpolator class type
-		 */
-		public static function addInterpolatorType(valueType:String, interpType:String) : void
-		{
-			_lookup[valueType] = interpType;
-		}
-				
-		/**
-		 * Clears the lookup table of interpolator types, removing all
-		 * type to interpolator mappings.
-		 */
-		public static function clearInterpolatorTypes():void
-		{
-			_lookup = new Object();
-		}
-		
-		/**
-		 * Adds a rule to the interpolator factory. The input function should
-		 * take a target object, property name string, and target value as
-		 * arguments and either return a fully qualified class name for the
-		 * type of interpolator to use, or null if this rule does not apply.
-		 * @param f the rule function for supplying custom interpolator types
-		 *  based on contextual conditions
-		 */
-		public static function addInterpolatorRule(f:Function):void
-		{
-			_rules.push(f);
-		}
-		
-		/**
-		 * Clears all interpolator rule functions from the interpolator
-		 * factory.
-		 */
-		public static function clearInterpolatorRules():void
-		{
-			_rules = new Array();
-		}
-		
-		/**
-		 * Returns a new interpolator instance for the given target object,
-		 * property name, and interpolation target value. This factory method
-		 * follows these steps to provide an interpolator instance:
-		 * <ol>
-		 *  <li>The list of installed interpolator rules is consulted, and if a
-		 *      rule returns a non-null class name string, an interpolator of
-		 *      that type will be returned.</li>
-		 *  <li>If all rules return null values, then the class type of the
-		 *      interpolation value is used to look up the appropriate
-		 *      interpolator type for that value. If a matching interpolator
-		 *      type is found, an interpolator is initialized and returned.
-		 *      </li>
-		 *  <li>If no matching type is found, a default ObjectInterpolator
-		 *      instance is initialized and returned.</li>
-		 * </ol>
-		 * 
-		 * <p>By default, the interpolator factory contains two rules. The
-		 * first rule returns the class name of ColorInterpolator for any
-		 * property names containing the string "color" or "Color". The second
-		 * rule returns the class name of ObjectInterpolator for the property
-		 * name "shape".</p>
-		 * 
-		 * <p>The default value type to interpolator type mappings are:
-		 * <ul>
-		 *  <li><code>Number -> NumberInterpolator</code></li>
-		 *  <li><code>int -> NumberInterpolator</code></li>
-		 *  <li><code>Date -> DateInterpolator</code></li>
-		 *  <li><code>Array -> ArrayInterpolator</code></li>
-		 *  <li><code>flash.geom.Point -> PointInterpolator</code></li>
-		 *  <li><code>flash.geom.Rectangle -> RectangleInterpolator</code></li>
-		 * </ul>
-		 * </p>
-		 * 
-		 * <p>The interpolator factory can be extended either by adding new
-		 * interpolation rule functions or by adding new mappings from
-		 * interpolation value types to custom interpolator classes.</p>
-		 */
-		public static function create(target:Object, property:String,
-			                          start:Object, end:Object): Interpolator
-		{
-			// first, check the rules list for an interpolator
-			var name:String = null;
-			for (var i:uint=0; name==null && i<_rules.length; ++i) {
-				name = _rules[i](target, property, start, end);
-			}
-			// if no matching rule, use the type lookup table
-			if (name == null) {
-				name = _lookup[getQualifiedClassName(end)];
-			}
-			// if that fails, use ObjectInterpolator as default
-			if (name == null) {
-				name = "flare.animate.interpolate::ObjectInterpolator";
-			}
-			
-			// now create the interpolator, recycling from the pool if possible
-			var pool:Array = _pools[name] as Array;
-			if (pool == null || pool.length == 0) {
-				// nothing in the pool, create a new instance
-				var Ref:Class = getDefinitionByName(name) as Class;
-				return new Ref(target, property, start, end) as Interpolator;
-			} else {
-				// reuse an interpolator from the object pool
-				var interp:Interpolator = pool.pop() as Interpolator;
-				interp.reset(target, property, start, end);
-				return interp;
-			}
-		}
-		
-		/**
-		 * Reclaims an interpolator for later recycling. The reclaimed
-		 * interpolator should not be in active use by any other classes.
-		 * @param interp the Interpolator to reclaim
-		 */
-		public static function reclaim(interp:Interpolator):void
-		{
-			var type:String = getQualifiedClassName(interp); 
-			var pool:Array = _pools[type] as Array;
-			if (pool == null) {
-				_pools[type] = [interp];
-			} else if (pool.length < _maxPoolSize) {
-				pool.push(interp);
-			}
-		}
-		
-	} // end of class Interpolator
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/interpolate/MatrixInterpolator.as b/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/interpolate/MatrixInterpolator.as
deleted file mode 100644
index a27c756744..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/interpolate/MatrixInterpolator.as
+++ /dev/null
@@ -1,70 +0,0 @@
-package flare.animate.interpolate
-{
-	import flash.geom.Matrix;
-	
-	/**
-	 * Interpolator for <code>flash.geom.Matrix</code> values.
-	 */
-	public class MatrixInterpolator extends Interpolator
-	{
-		private var _startA:Number, _startB:Number, _startC:Number;
-		private var _startD:Number, _startX:Number, _startY:Number;
-		private var _rangeA:Number, _rangeB:Number, _rangeC:Number;
-		private var _rangeD:Number, _rangeX:Number, _rangeY:Number;
-		private var _cur:Matrix;
-		
-		/**
-		 * Creates a new MatrixInterpolator.
-		 * @param target the object whose property is being interpolated
-		 * @param property the property to interpolate
-		 * @param start the starting matrix value to interpolate from
-		 * @param end the target matrix value to interpolate to
-		 */
-		public function MatrixInterpolator(target:Object, property:String,
-		                                   start:Object, end:Object)
-		{
-			super(target, property, start, end);
-		}
-		
-		/**
-		 * Initializes this interpolator.
-		 * @param start the starting value of the interpolation
-		 * @param end the target value of the interpolation
-		 */
-		protected override function init(start:Object, end:Object) : void
-		{
-			var e:Matrix = Matrix(end), s:Matrix = Matrix(start);
-			if (_cur == null || _cur == s || _cur == e)
-				_cur = e.clone();
-			
-			_startA = s.a;
-			_startB = s.b;
-			_startC = s.c;
-			_startD = s.d;
-			_startX = s.tx;
-			_startY = s.ty;
-			_rangeA = e.a  - _startA;
-			_rangeB = e.b  - _startB;
-			_rangeC = e.c  - _startC;
-			_rangeD = e.d  - _startD;
-			_rangeX = e.tx - _startX;
-			_rangeY = e.ty - _startY;
-		}
-		
-		/**
-		 * Calculate and set an interpolated property value.
-		 * @param f the interpolation fraction (typically between 0 and 1)
-		 */
-		public override function interpolate(f:Number) : void
-		{
-			_cur.a  = _startA + f * _rangeA;
-			_cur.b  = _startB + f * _rangeB;
-			_cur.c  = _startC + f * _rangeC;
-			_cur.d  = _startD + f * _rangeD;
-			_cur.tx = _startX + f * _rangeX;
-			_cur.ty = _startY + f * _rangeY;
-			_prop.setValue(_target, _cur);
-		}
-		
-	} // end of class MatrixInterpolator
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/interpolate/NumberInterpolator.as b/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/interpolate/NumberInterpolator.as
deleted file mode 100644
index 069ccafce0..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/interpolate/NumberInterpolator.as
+++ /dev/null
@@ -1,47 +0,0 @@
-package flare.animate.interpolate
-{
-	/**
-	 * Interpolator for <code>Number</code> and <code>int</code> values.
-	 */
-	public class NumberInterpolator extends Interpolator
-	{
-		private var _start:Number;
-		private var _end:Number;
-		
-		/**
-		 * Creates a new NumberInterpolator.
-		 * @param target the object whose property is being interpolated
-		 * @param property the property to interpolate
-		 * @param start the starting number to interpolate from
-		 * @param end the target number to interpolate to
-		 */
-		public function NumberInterpolator(target:Object, property:String,
-                                           start:Object, end:Object)
-		{
-			super(target, property, start, end);
-		}
-		
-		/**
-		 * Initializes this interpolator.
-		 * @param start the starting value of the interpolation
-		 * @param end the target value of the interpolation
-		 */
-		protected override function init(start:Object, end:Object) : void
-		{
-			_start = Number(start);
-			_end = Number(end);
-			if (isNaN(_start)) _start = _end;
-			_end = _end - _start;
-		}
-		
-		/**
-		 * Calculate and set an interpolated property value.
-		 * @param f the interpolation fraction (typically between 0 and 1)
-		 */
-		public override function interpolate(f:Number) : void
-		{
-			_prop.setValue(_target, _start + f*_end);
-		}
-		
-	} // end of class NumberInterpolator
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/interpolate/ObjectInterpolator.as b/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/interpolate/ObjectInterpolator.as
deleted file mode 100644
index 4370e2c7d3..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/interpolate/ObjectInterpolator.as
+++ /dev/null
@@ -1,50 +0,0 @@
-package flare.animate.interpolate
-{
-	/**
-	 * Interpolator for arbitrary <code>Object</code> values. Simply swaps the
-	 * initial value for the end value for interpolation fractions greater
-	 * than or equal to 0.5.
-	 */
-	public class ObjectInterpolator extends Interpolator
-	{
-		private var _start:Object;
-		private var _end:Object;
-		
-		/**
-		 * Creates a new ObjectInterpolator.
-		 * @param target the object whose property is being interpolated
-		 * @param property the property to interpolate
-		 * @param start the starting object value to interpolate from
-		 * @param end the target object value to interpolate to
-		 */
-		public function ObjectInterpolator(target:Object, property:String,
-		                                   start:Object, end:Object)
-		{
-			super(target, property, start, end);
-		}
-		
-		/**
-		 * Initializes this interpolator.
-		 * @param start the starting value of the interpolation
-		 * @param end the target value of the interpolation
-		 */
-		protected override function init(start:Object, end:Object) : void
-		{
-			_start = start;
-			_end = end;
-		}
-		
-		/**
-		 * Calculate and set an interpolated property value. This method sets
-		 * the target object's property to the starting value if the
-		 * interpolation fraction is less than 0.5 and to the ending value if
-		 * the fraction is greather than or equal to 0.5.
-		 * @param f the interpolation fraction (typically between 0 and 1)
-		 */
-		public override function interpolate(f:Number) : void
-		{
-			_prop.setValue(_target, f < 0.5 ? _start : _end);
-		}
-		
-	} // end of class ObjectInterpolator
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/interpolate/PointInterpolator.as b/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/interpolate/PointInterpolator.as
deleted file mode 100644
index 95d7f8d16c..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/interpolate/PointInterpolator.as
+++ /dev/null
@@ -1,56 +0,0 @@
-package flare.animate.interpolate
-{
-	import flash.geom.Point;
-	
-	/**
-	 * Interpolator for <code>flash.geom.Point</code> values.
-	 */
-	public class PointInterpolator extends Interpolator
-	{
-		private var _startX:Number, _startY:Number;
-		private var _rangeX:Number, _rangeY:Number;
-		private var _cur:Point;
-		
-		/**
-		 * Creates a new PointInterpolator.
-		 * @param target the object whose property is being interpolated
-		 * @param property the property to interpolate
-		 * @param start the starting point value to interpolate from
-		 * @param end the target point value to interpolate to
-		 */
-		public function PointInterpolator(target:Object, property:String,
-		                                  start:Object, end:Object)
-		{
-			super(target, property, start, end);
-		}
-		
-		/**
-		 * Initializes this interpolator.
-		 * @param start the starting value of the interpolation
-		 * @param end the target value of the interpolation
-		 */
-		protected override function init(start:Object, end:Object) : void
-		{
-			var e:Point = Point(end), s:Point = Point(start);
-			if (_cur == null || _cur == s || _cur == e)
-				_cur = e.clone();
-			
-			_startX = s.x;
-			_startY = s.y;
-			_rangeX = e.x - _startX;
-			_rangeY = e.y - _startY;
-		}
-		
-		/**
-		 * Calculate and set an interpolated property value.
-		 * @param f the interpolation fraction (typically between 0 and 1)
-		 */
-		public override function interpolate(f:Number) : void
-		{
-			_cur.x = _startX + f*_rangeX;
-			_cur.y = _startY + f*_rangeY;
-			_prop.setValue(_target, _cur);
-		}
-		
-	} // end of class PointInterpolator
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/interpolate/RectangleInterpolator.as b/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/interpolate/RectangleInterpolator.as
deleted file mode 100644
index e5b0b0edce..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.animate/flare/animate/interpolate/RectangleInterpolator.as
+++ /dev/null
@@ -1,65 +0,0 @@
-package flare.animate.interpolate
-{
-	import flash.geom.Rectangle;
-	
-	/**
-	 * Interpolator for <code>flash.geom.Rectangle</code> values.
-	 */
-	public class RectangleInterpolator extends Interpolator
-	{
-		private var _startX:Number, _startY:Number;
-		private var _startW:Number, _startH:Number;
-		private var _rangeX:Number, _rangeY:Number;
-		private var _rangeW:Number, _rangeH:Number;
-
-		private var _cur:Rectangle;
-		
-		/**
-		 * Creates a new RectangleInterpolator.
-		 * @param target the object whose property is being interpolated
-		 * @param property the property to interpolate
-		 * @param start the starting rectangle value to interpolate from
-		 * @param end the target re3ctangle value to interpolate to
-		 */
-		public function RectangleInterpolator(target:Object, property:String,
-		                                      start:Object, end:Object)
-		{
-			super(target, property, start, end);
-		}
-		
-		/**
-		 * Initializes this interpolator.
-		 * @param start the starting value of the interpolation
-		 * @param end the target value of the interpolation
-		 */
-		protected override function init(start:Object, end:Object) : void
-		{
-			var e:Rectangle = Rectangle(end), s:Rectangle = Rectangle(start);
-			if (_cur == null || _cur == s || _cur == e)
-				_cur = e.clone();
-			
-			_startX = s.x;
-			_startY = s.y;
-			_startW = s.width;
-			_startH = s.height;
-			_rangeX = e.x - _startX;
-			_rangeY = e.y - _startY;
-			_rangeW = e.width - _startW;
-			_rangeH = e.height - _startH;
-		}
-		
-		/**
-		 * Calculate and set an interpolated property value.
-		 * @param f the interpolation fraction (typically between 0 and 1)
-		 */
-		public override function interpolate(f:Number) : void
-		{
-			_cur.x      = _startX + f * _rangeX;
-			_cur.y      = _startY + f * _rangeY;
-			_cur.width  = _startW + f * _rangeW;
-			_cur.height = _startH + f * _rangeH;
-			_prop.setValue(_target, _cur);
-		}
-		
-	} // end of class RectangleInterpolator
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.data/.actionScriptProperties b/grade/report/visual/flare_visualization/flare/flare.data/.actionScriptProperties
deleted file mode 100644
index 5b3a1e26ae..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.data/.actionScriptProperties
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<actionScriptProperties mainApplicationPath="flaredata.as" version="3">
-  <compiler additionalCompilerArguments="" copyDependentFiles="false" enableModuleDebug="true" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="false" htmlHistoryManagement="false" htmlPlayerVersion="9.0.28" htmlPlayerVersionCheck="true" outputFolderPath="bin" strict="true" useApolloConfig="false" verifyDigests="true" warn="true">
-    <compilerSourcePath/>
-    <libraryPath defaultLinkType="1">
-      <libraryPathEntry kind="4" path=""/>
-      <libraryPathEntry kind="3" linkType="1" path="/flare.util/bin/flare.util.swc" useDefaultLinkType="false"/>
-    </libraryPath>
-    <sourceAttachmentPath/>
-  </compiler>
-  <applications>
-    <application path="flaredata.as"/>
-  </applications>
-  <modules/>
-  <buildCSSFiles/>
-</actionScriptProperties>
diff --git a/grade/report/visual/flare_visualization/flare/flare.data/.flexLibProperties b/grade/report/visual/flare_visualization/flare/flare.data/.flexLibProperties
deleted file mode 100644
index 9620e543f6..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.data/.flexLibProperties
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<flexLibProperties version="1">
-  <includeClasses>
-    <classEntry path="flare.data.DataField"/>
-    <classEntry path="flare.data.DataUtil"/>
-    <classEntry path="flare.data.converters.DelimitedTextConverter"/>
-    <classEntry path="flare.data.converters.JSONConverter"/>
-    <classEntry path="flare.data.converters.GraphMLConverter"/>
-    <classEntry path="flare.data.DataSchema"/>
-    <classEntry path="flare.data.DataSource"/>
-    <classEntry path="flare.data.DataSet"/>
-    <classEntry path="flare.data.DataTable"/>
-  </includeClasses>
-  <includeResources/>
-  <namespaceManifests/>
-</flexLibProperties>
diff --git a/grade/report/visual/flare_visualization/flare/flare.data/.project b/grade/report/visual/flare_visualization/flare/flare.data/.project
deleted file mode 100644
index e4d936aae8..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.data/.project
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>flare.data</name>
-	<comment></comment>
-	<projects>
-		<project>flare.util</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.adobe.flexbuilder.project.flexbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.adobe.flexbuilder.project.flexlibnature</nature>
-		<nature>com.adobe.flexbuilder.project.actionscriptnature</nature>
-	</natures>
-</projectDescription>
diff --git a/grade/report/visual/flare_visualization/flare/flare.data/bin/flare.data.swc b/grade/report/visual/flare_visualization/flare/flare.data/bin/flare.data.swc
deleted file mode 100644
index eedf583719..0000000000
Binary files a/grade/report/visual/flare_visualization/flare/flare.data/bin/flare.data.swc and /dev/null differ
diff --git a/grade/report/visual/flare_visualization/flare/flare.data/com/adobe/serialization/json/JSON.as b/grade/report/visual/flare_visualization/flare/flare.data/com/adobe/serialization/json/JSON.as
deleted file mode 100644
index c036b8c195..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.data/com/adobe/serialization/json/JSON.as
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-Adobe Systems Incorporated(r) Source Code License Agreement
-Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
-	
-Please read this Source Code License Agreement carefully before using
-the source code.
-	
-Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable copyright license, to reproduce,
-prepare derivative works of, publicly display, publicly perform, and
-distribute this source code and such derivative works in source or
-object code form without any attribution requirements.
-	
-The name "Adobe Systems Incorporated" must not be used to endorse or promote products
-derived from the source code without prior written permission.
-	
-You agree to indemnify, hold harmless and defend Adobe Systems Incorporated from and
-against any loss, damage, claims or lawsuits, including attorney's
-fees that arise or result from your use or distribution of the source
-code.
-	
-THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
-ANY TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
-NON-INFRINGEMENT, TITLE OR QUIET ENJOYMENT. IN NO EVENT SHALL MACROMEDIA
-OR ITS SUPPLIERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-package com.adobe.serialization.json {
-
-	/**
-	 * This class provides encoding and decoding of the JSON format.
-	 *
-	 * Example usage:
-	 * <code>
-	 * 		// create a JSON string from an internal object
-	 * 		JSON.encode( myObject );
-	 *
-	 *		// read a JSON string into an internal object
-	 *		var myObject:Object = JSON.decode( jsonString );
-	 *	</code>
-       * @private
-	 */
-	public class JSON {
-	
-	
-		/**
-		 * Encodes a object into a JSON string.
-		 *
-		 * @param o The object to create a JSON string for
-		 * @return the JSON string representing o
-		 * @langversion ActionScript 3.0
-		 * @playerversion Flash 8.5
-		 * @tiptext
-		 */
-		public static function encode( o:Object ):String {
-			
-			var encoder:JSONEncoder = new JSONEncoder( o );
-			return encoder.getString();
-		
-		}
-		
-		/**
-		 * Decodes a JSON string into a native object.
-		 * 
-		 * @param s The JSON string representing the object
-		 * @return A native object as specified by s
-		 * @throw JSONParseError
-		 * @langversion ActionScript 3.0
-		 * @playerversion Flash 8.5
-		 * @tiptext
-		 */
-		public static function decode( s:String ):Object {
-			
-			var decoder:JSONDecoder = new JSONDecoder( s )
-			return decoder.getObject();
-			
-		}
-	
-	}
-
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.data/com/adobe/serialization/json/JSONDecoder.as b/grade/report/visual/flare_visualization/flare/flare.data/com/adobe/serialization/json/JSONDecoder.as
deleted file mode 100644
index bc5c1160d5..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.data/com/adobe/serialization/json/JSONDecoder.as
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
-Adobe Systems Incorporated(r) Source Code License Agreement
-Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
-	
-Please read this Source Code License Agreement carefully before using
-the source code.
-	
-Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable copyright license, to reproduce,
-prepare derivative works of, publicly display, publicly perform, and
-distribute this source code and such derivative works in source or
-object code form without any attribution requirements.
-	
-The name "Adobe Systems Incorporated" must not be used to endorse or promote products
-derived from the source code without prior written permission.
-	
-You agree to indemnify, hold harmless and defend Adobe Systems Incorporated from and
-against any loss, damage, claims or lawsuits, including attorney's
-fees that arise or result from your use or distribution of the source
-code.
-	
-THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
-ANY TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
-NON-INFRINGEMENT, TITLE OR QUIET ENJOYMENT. IN NO EVENT SHALL MACROMEDIA
-OR ITS SUPPLIERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-package com.adobe.serialization.json {
-
-      /**
-       * @private
-       */
-	public class JSONDecoder {
-		
-		/** The object that will get parsed from the JSON string */
-		private var obj:Object;
-		
-		/** The tokenizer designated to read the JSON string */
-		private var tokenizer:JSONTokenizer;
-		
-		/** The current token from the tokenizer */
-		private var token:JSONToken;
-		
-		/**
-		 * Constructs a new JSONDecoder to parse a JSON string 
-		 * into a native object.
-		 *
-		 * @param s The JSON string to be converted
-		 *		into a native object
-		 * @langversion ActionScript 3.0
-		 * @playerversion Flash 8.5
-		 * @tiptext
-		 */
-		public function JSONDecoder( s:String ) {
-			
-			tokenizer = new JSONTokenizer( s );
-			
-			nextToken();
-			obj = parseValue();
-			
-		}
-		
-		/**
-		 * Gets the internal object that was created by parsing
-		 * the JSON string passed to the constructor.
-		 *
-		 * @return The internal object representation of the JSON
-		 * 		string that was passed to the constructor
-		 * @langversion ActionScript 3.0
-		 * @playerversion Flash 8.5
-		 * @tiptext
-		 */
-		public function getObject():Object {
-			
-			return obj;
-		}
-		
-		/**
-		 * Returns the next token from the tokenzier reading
-		 * the JSON string
-		 */
-		private function nextToken():JSONToken {
-			return token = tokenizer.getNextToken();
-		}
-		
-		/**
-		 * Attempt to parse an array
-		 */
-		private function parseArray():Array {
-			// create an array internally that we're going to attempt
-			// to parse from the tokenizer
-			var a:Array = new Array();
-			
-			// grab the next token from the tokenizer to move
-			// past the opening [
-			nextToken();
-			
-			// check to see if we have an empty array
-			if ( token.type == JSONTokenType.RIGHT_BRACKET ) {
-				// we're done reading the array, so return it
-				return a;
-			}
-			
-			// deal with elements of the array, and use an "infinite"
-			// loop because we could have any amount of elements
-			while ( true ) {
-				// read in the value and add it to the array
-				a.push ( parseValue() );
-			
-				// after the value there should be a ] or a ,
-				nextToken();
-				
-				if ( token.type == JSONTokenType.RIGHT_BRACKET ) {
-					// we're done reading the array, so return it
-					return a;
-				} else if ( token.type == JSONTokenType.COMMA ) {
-					// move past the comma and read another value
-					nextToken();
-				} else {
-					tokenizer.parseError( "Expecting ] or , but found " + token.value );
-				}
-			}
-            return null;
-		}
-		
-		/**
-		 * Attempt to parse an object
-		 */
-		private function parseObject():Object {
-			// create the object internally that we're going to
-			// attempt to parse from the tokenizer
-			var o:Object = new Object();
-						
-			// store the string part of an object member so
-			// that we can assign it a value in the object
-			var key:String
-			
-			// grab the next token from the tokenizer
-			nextToken();
-			
-			// check to see if we have an empty object
-			if ( token.type == JSONTokenType.RIGHT_BRACE ) {
-				// we're done reading the object, so return it
-				return o;
-			}
-			
-			// deal with members of the object, and use an "infinite"
-			// loop because we could have any amount of members
-			while ( true ) {
-			
-				if ( token.type == JSONTokenType.STRING ) {
-					// the string value we read is the key for the object
-					key = String( token.value );
-					
-					// move past the string to see what's next
-					nextToken();
-					
-					// after the string there should be a :
-					if ( token.type == JSONTokenType.COLON ) {
-						
-						// move past the : and read/assign a value for the key
-						nextToken();
-						o[key] = parseValue();	
-						
-						// move past the value to see what's next
-						nextToken();
-						
-						// after the value there's either a } or a ,
-						if ( token.type == JSONTokenType.RIGHT_BRACE ) {
-							// // we're done reading the object, so return it
-							return o;
-							
-						} else if ( token.type == JSONTokenType.COMMA ) {
-							// skip past the comma and read another member
-							nextToken();
-						} else {
-							tokenizer.parseError( "Expecting } or , but found " + token.value );
-						}
-					} else {
-						tokenizer.parseError( "Expecting : but found " + token.value );
-					}
-				} else {
-					tokenizer.parseError( "Expecting string but found " + token.value );
-				}
-			}
-            return null;
-		}
-		
-		/**
-		 * Attempt to parse a value
-		 */
-		private function parseValue():Object {
-					
-			switch ( token.type ) {
-				case JSONTokenType.LEFT_BRACE:
-					return parseObject();
-					
-				case JSONTokenType.LEFT_BRACKET:
-					return parseArray();
-					
-				case JSONTokenType.STRING:
-				case JSONTokenType.NUMBER:
-				case JSONTokenType.TRUE:
-				case JSONTokenType.FALSE:
-				case JSONTokenType.NULL:
-					return token.value;
-
-				default:
-					tokenizer.parseError( "Unexpected " + token.value );
-					
-			}
-            return null;
-		}
-	}
-}
diff --git a/grade/report/visual/flare_visualization/flare/flare.data/com/adobe/serialization/json/JSONEncoder.as b/grade/report/visual/flare_visualization/flare/flare.data/com/adobe/serialization/json/JSONEncoder.as
deleted file mode 100644
index c1b1ca1bde..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.data/com/adobe/serialization/json/JSONEncoder.as
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
-Adobe Systems Incorporated(r) Source Code License Agreement
-Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
-	
-Please read this Source Code License Agreement carefully before using
-the source code.
-	
-Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable copyright license, to reproduce,
-prepare derivative works of, publicly display, publicly perform, and
-distribute this source code and such derivative works in source or
-object code form without any attribution requirements.
-	
-The name "Adobe Systems Incorporated" must not be used to endorse or promote products
-derived from the source code without prior written permission.
-	
-You agree to indemnify, hold harmless and defend Adobe Systems Incorporated from and
-against any loss, damage, claims or lawsuits, including attorney's
-fees that arise or result from your use or distribution of the source
-code.
-	
-THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
-ANY TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
-NON-INFRINGEMENT, TITLE OR QUIET ENJOYMENT. IN NO EVENT SHALL MACROMEDIA
-OR ITS SUPPLIERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-package com.adobe.serialization.json {
-
-      /**
-       * @private
-       */
-	public class JSONEncoder {
-	
-		/** The string that is going to represent the object we're encoding */
-		private var jsonString:String;
-		
-		/**
-		 * Creates a new JSONEncoder.
-		 *
-		 * @param o The object to encode as a JSON string
-		 * @langversion ActionScript 3.0
-		 * @playerversion Flash 8.5
-		 * @tiptext
-		 */
-		public function JSONEncoder( o:Object ) {
-			jsonString = convertToString( o );
-		
-		}
-		
-		/**
-		 * Gets the JSON string from the encoder.
-		 *
-		 * @return The JSON string representation of the object
-		 * 		that was passed to the constructor
-		 * @langversion ActionScript 3.0
-		 * @playerversion Flash 8.5
-		 * @tiptext
-		 */
-		public function getString():String {
-			return jsonString;
-		}
-		
-		/**
-		 * Converts a value to it's JSON string equivalent.
-		 *
-		 * @param value The value to convert.  Could be any 
-		 *		type (object, number, array, etc)
-		 */
-		private function convertToString( value:Object ):String {
-			
-			// determine what value is and convert it based on it's type
-			if ( value is String ) {
-				
-				// escape the string so it's formatted correctly
-				return escapeString( value as String );
-				
-			} else if ( value is Number ) {
-				
-				// only encode numbers that finate
-				return isFinite( value as Number) ? value.toString() : "null";
-
-			} else if ( value is Boolean ) {
-				
-				// convert boolean to string easily
-				return value ? "true" : "false";
-
-			} else if ( value is Array ) {
-			
-				// call the helper method to convert an array
-				return arrayToString( value as Array );
-			
-			} else if ( value is Object && value != null ) {
-			
-				// call the helper method to convert an object
-				return objectToString( value );
-			}
-            return "null";
-		}
-		
-		/**
-		 * Escapes a string accoding to the JSON specification.
-		 *
-		 * @param str The string to be escaped
-		 * @return The string with escaped special characters
-		 * 		according to the JSON specification
-		 */
-		private function escapeString( str:String ):String {
-			// create a string to store the string's jsonstring value
-			var s:String = "";
-			// current character in the string we're processing
-			var ch:String;
-			// store the length in a local variable to reduce lookups
-			var len:Number = str.length;
-			
-			// loop over all of the characters in the string
-			for ( var i:int = 0; i < len; i++ ) {
-			
-				// examine the character to determine if we have to escape it
-				ch = str.charAt( i );
-				switch ( ch ) {
-				
-					case '"':	// quotation mark
-						s += "\\\"";
-						break;
-						
-					//case '/':	// solidus
-					//	s += "\\/";
-					//	break;
-						
-					case '\\':	// reverse solidus
-						s += "\\\\";
-						break;
-						
-					case '\b':	// bell
-						s += "\\b";
-						break;
-						
-					case '\f':	// form feed
-						s += "\\f";
-						break;
-						
-					case '\n':	// newline
-						s += "\\n";
-						break;
-						
-					case '\r':	// carriage return
-						s += "\\r";
-						break;
-						
-					case '\t':	// horizontal tab
-						s += "\\t";
-						break;
-						
-					default:	// everything else
-						
-						// check for a control character and escape as unicode
-						if ( ch < ' ' ) {
-							// get the hex digit(s) of the character (either 1 or 2 digits)
-							var hexCode:String = ch.charCodeAt( 0 ).toString( 16 );
-							
-							// ensure that there are 4 digits by adjusting
-							// the # of zeros accordingly.
-							var zeroPad:String = hexCode.length == 2 ? "00" : "000";
-							
-							// create the unicode escape sequence with 4 hex digits
-							s += "\\u" + zeroPad + hexCode;
-						} else {
-						
-							// no need to do any special encoding, just pass-through
-							s += ch;
-							
-						}
-				}	// end switch
-				
-			}	// end for loop
-						
-			return "\"" + s + "\"";
-		}
-		
-		/**
-		 * Converts an array to it's JSON string equivalent
-		 *
-		 * @param a The array to convert
-		 * @return The JSON string representation of <code>a</code>
-		 */
-		private function arrayToString( a:Array ):String {
-			// create a string to store the array's jsonstring value
-			var s:String = "";
-			
-			// loop over the elements in the array and add their converted
-			// values to the string
-			for ( var i:int = 0; i < a.length; i++ ) {
-				// when the length is 0 we're adding the first element so
-				// no comma is necessary
-				if ( s.length > 0 ) {
-					// we've already added an element, so add the comma separator
-					s += ","
-				}
-				
-				// convert the value to a string
-				s += convertToString( a[i] );	
-			}
-			
-			// KNOWN ISSUE:  In ActionScript, Arrays can also be associative
-			// objects and you can put anything in them, ie:
-			//		myArray["foo"] = "bar";
-			//
-			// These properties aren't picked up in the for loop above because
-			// the properties don't correspond to indexes.  However, we're
-			// sort of out luck because the JSON specification doesn't allow
-			// these types of array properties.
-			//
-			// So, if the array was also used as an associative object, there
-			// may be some values in the array that don't get properly encoded.
-			//
-			// A possible solution is to instead encode the Array as an Object
-			// but then it won't get decoded correctly (and won't be an
-			// Array instance)
-						
-			// close the array and return it's string value
-			return "[" + s + "]";
-		}
-		
-		/**
-		 * Converts an object to it's JSON string equivalent
-		 *
-		 * @param o The object to convert
-		 * @return The JSON string representation of <code>o</code>
-		 */
-		private function objectToString( o:Object ):String {
-			
-			// create a string to store the object's jsonstring value
-			var s:String = "";
-			
-			// the value of o[key] in the loop below - store this 
-			// as a variable so we don't have to keep looking up o[key]
-			// when testing for valid values to convert
-			var value:Object;
-			
-			// loop over the keys in the object and add their converted
-			// values to the string
-			for ( var key:String in o ) {
-				// assign value to a variable for quick lookup
-				value = o[key];
-				
-				// don't add function's to the JSON string
-				if ( value is Function ) {
-					// skip this key and try another
-					continue;
-				}
-				
-				// when the length is 0 we're adding the first item so
-				// no comma is necessary
-				if ( s.length > 0 ) {
-					// we've already added an item, so add the comma separator
-					s += ","
-				}
-				
-				s += escapeString( key ) + ":" + convertToString( value );
-			}
-			
-			return "{" + s + "}";
-		}
-		
-	}
-	
-}
diff --git a/grade/report/visual/flare_visualization/flare/flare.data/com/adobe/serialization/json/JSONParseError.as b/grade/report/visual/flare_visualization/flare/flare.data/com/adobe/serialization/json/JSONParseError.as
deleted file mode 100644
index b5808736d0..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.data/com/adobe/serialization/json/JSONParseError.as
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-Adobe Systems Incorporated(r) Source Code License Agreement
-Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
-	
-Please read this Source Code License Agreement carefully before using
-the source code.
-	
-Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable copyright license, to reproduce,
-prepare derivative works of, publicly display, publicly perform, and
-distribute this source code and such derivative works in source or
-object code form without any attribution requirements.
-	
-The name "Adobe Systems Incorporated" must not be used to endorse or promote products
-derived from the source code without prior written permission.
-	
-You agree to indemnify, hold harmless and defend Adobe Systems Incorporated from and
-against any loss, damage, claims or lawsuits, including attorney's
-fees that arise or result from your use or distribution of the source
-code.
-	
-THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
-ANY TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
-NON-INFRINGEMENT, TITLE OR QUIET ENJOYMENT. IN NO EVENT SHALL MACROMEDIA
-OR ITS SUPPLIERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-package com.adobe.serialization.json {
-
-      /**
-       * @private
-       */
-	public class JSONParseError extends Error 	{
-	
-		/** The location in the string where the error occurred */
-		private var _location:int;
-		
-		/** The string in which the parse error occurred */
-		private var _text:String;
-	
-		/**
-		 * Constructs a new JSONParseError.
-		 *
-		 * @param message The error message that occured during parsing
-		 * @langversion ActionScript 3.0
-		 * @playerversion Flash 8.5
-		 * @tiptext
-		 */
-		public function JSONParseError( message:String = "", location:int = 0, text:String = "") {
-			super( message );
-			//name = "JSONParseError";
-			_location = location;
-			_text = text;
-		}
-
-		/**
-		 * Provides read-only access to the location variable.
-		 *
-		 * @return The location in the string where the error occurred
-		 * @langversion ActionScript 3.0
-		 * @playerversion Flash 8.5
-		 * @tiptext
-		 */
-		public function get location():int {
-			return _location;
-		}
-		
-		/**
-		 * Provides read-only access to the text variable.
-		 *
-		 * @return The string in which the error occurred
-		 * @langversion ActionScript 3.0
-		 * @playerversion Flash 8.5
-		 * @tiptext
-		 */
-		public function get text():String {
-			return _text;
-		}
-	}
-	
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.data/com/adobe/serialization/json/JSONToken.as b/grade/report/visual/flare_visualization/flare/flare.data/com/adobe/serialization/json/JSONToken.as
deleted file mode 100644
index 94719e1e68..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.data/com/adobe/serialization/json/JSONToken.as
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
-Adobe Systems Incorporated(r) Source Code License Agreement
-Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
-	
-Please read this Source Code License Agreement carefully before using
-the source code.
-	
-Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable copyright license, to reproduce,
-prepare derivative works of, publicly display, publicly perform, and
-distribute this source code and such derivative works in source or
-object code form without any attribution requirements.
-	
-The name "Adobe Systems Incorporated" must not be used to endorse or promote products
-derived from the source code without prior written permission.
-	
-You agree to indemnify, hold harmless and defend Adobe Systems Incorporated from and
-against any loss, damage, claims or lawsuits, including attorney's
-fees that arise or result from your use or distribution of the source
-code.
-	
-THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
-ANY TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
-NON-INFRINGEMENT, TITLE OR QUIET ENJOYMENT. IN NO EVENT SHALL MACROMEDIA
-OR ITS SUPPLIERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-package com.adobe.serialization.json {
-
-      /**
-       * @private
-       */
-	public class JSONToken {
-	
-		private var _type:int;
-		private var _value:Object;
-		
-		/**
-		 * Creates a new JSONToken with a specific token type and value.
-		 *
-		 * @param type The JSONTokenType of the token
-		 * @param value The value of the token
-		 * @langversion ActionScript 3.0
-		 * @playerversion Flash 8.5
-		 * @tiptext
-		 */
-		public function JSONToken( type:int = -1 /* JSONTokenType.UNKNOWN */, value:Object = null ) {
-			_type = type;
-			_value = value;
-		}
-		
-		/**
-		 * Returns the type of the token.
-		 *
-		 * @see com.adobe.serialization.json.JSONTokenType
-		 * @langversion ActionScript 3.0
-		 * @playerversion Flash 8.5
-		 * @tiptext
-		 */
-		public function get type():int {
-			return _type;	
-		}
-		
-		/**
-		 * Sets the type of the token.
-		 *
-		 * @see com.adobe.serialization.json.JSONTokenType
-		 * @langversion ActionScript 3.0
-		 * @playerversion Flash 8.5
-		 * @tiptext
-		 */
-		public function set type( value:int ):void {
-			_type = value;	
-		}
-		
-		/**
-		 * Gets the value of the token
-		 *
-		 * @see com.adobe.serialization.json.JSONTokenType
-		 * @langversion ActionScript 3.0
-		 * @playerversion Flash 8.5
-		 * @tiptext
-		 */
-		public function get value():Object {
-			return _value;	
-		}
-		
-		/**
-		 * Sets the value of the token
-		 *
-		 * @see com.adobe.serialization.json.JSONTokenType
-		 * @langversion ActionScript 3.0
-		 * @playerversion Flash 8.5
-		 * @tiptext
-		 */
-		public function set value ( v:Object ):void {
-			_value = v;	
-		}
-
-	}
-	
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.data/com/adobe/serialization/json/JSONTokenType.as b/grade/report/visual/flare_visualization/flare/flare.data/com/adobe/serialization/json/JSONTokenType.as
deleted file mode 100644
index 8d239f22d9..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.data/com/adobe/serialization/json/JSONTokenType.as
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-Adobe Systems Incorporated(r) Source Code License Agreement
-Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
-	
-Please read this Source Code License Agreement carefully before using
-the source code.
-	
-Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable copyright license, to reproduce,
-prepare derivative works of, publicly display, publicly perform, and
-distribute this source code and such derivative works in source or
-object code form without any attribution requirements.
-	
-The name "Adobe Systems Incorporated" must not be used to endorse or promote products
-derived from the source code without prior written permission.
-	
-You agree to indemnify, hold harmless and defend Adobe Systems Incorporated from and
-against any loss, damage, claims or lawsuits, including attorney's
-fees that arise or result from your use or distribution of the source
-code.
-	
-THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
-ANY TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
-NON-INFRINGEMENT, TITLE OR QUIET ENJOYMENT. IN NO EVENT SHALL MACROMEDIA
-OR ITS SUPPLIERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-package com.adobe.serialization.json {
-
-	/**
-	 * Class containing constant values for the different types
-	 * of tokens in a JSON encoded string.
-       * @private
-       */
-	public class JSONTokenType {
-	
-		public static const UNKNOWN:int = -1;
-		
-		public static const COMMA:int = 0;
-		
-		public static const LEFT_BRACE:int = 1;
-		
-		public static const RIGHT_BRACE:int = 2;
-		
-		public static const LEFT_BRACKET:int = 3;
-		
-		public static const RIGHT_BRACKET:int = 4;
-		
-		public static const COLON:int = 6;
-		
-		public static const TRUE:int = 7;
-		
-		public static const FALSE:int = 8;
-		
-		public static const NULL:int = 9;
-		
-		public static const STRING:int = 10;
-		
-		public static const NUMBER:int = 11;
-		
-	}
-	
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.data/com/adobe/serialization/json/JSONTokenizer.as b/grade/report/visual/flare_visualization/flare/flare.data/com/adobe/serialization/json/JSONTokenizer.as
deleted file mode 100644
index 5d9546e07f..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.data/com/adobe/serialization/json/JSONTokenizer.as
+++ /dev/null
@@ -1,499 +0,0 @@
-/*
-Adobe Systems Incorporated(r) Source Code License Agreement
-Copyright(c) 2005 Adobe Systems Incorporated. All rights reserved.
-	
-Please read this Source Code License Agreement carefully before using
-the source code.
-	
-Adobe Systems Incorporated grants to you a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable copyright license, to reproduce,
-prepare derivative works of, publicly display, publicly perform, and
-distribute this source code and such derivative works in source or
-object code form without any attribution requirements.
-	
-The name "Adobe Systems Incorporated" must not be used to endorse or promote products
-derived from the source code without prior written permission.
-	
-You agree to indemnify, hold harmless and defend Adobe Systems Incorporated from and
-against any loss, damage, claims or lawsuits, including attorney's
-fees that arise or result from your use or distribution of the source
-code.
-	
-THIS SOURCE CODE IS PROVIDED "AS IS" AND "WITH ALL FAULTS", WITHOUT
-ANY TECHNICAL SUPPORT OR ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ALSO, THERE IS NO WARRANTY OF
-NON-INFRINGEMENT, TITLE OR QUIET ENJOYMENT. IN NO EVENT SHALL MACROMEDIA
-OR ITS SUPPLIERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOURCE CODE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-package com.adobe.serialization.json {
-
-      /**
-       * @private
-       */
-	public class JSONTokenizer {
-	
-		/** The object that will get parsed from the JSON string */
-		private var obj:Object;
-		
-		/** The JSON string to be parsed */
-		private var jsonString:String;
-		
-		/** The current parsing location in the JSON string */
-		private var loc:int;
-		
-		/** The current character in the JSON string during parsing */
-		private var ch:String;
-		
-		/**
-		 * Constructs a new JSONDecoder to parse a JSON string 
-		 * into a native object.
-		 *
-		 * @param s The JSON string to be converted
-		 *		into a native object
-		 */
-		public function JSONTokenizer( s:String ) {
-			jsonString = s;
-			loc = 0;
-			
-			// prime the pump by getting the first character
-			nextChar();
-		}
-		
-		/**
-		 * Gets the next token in the input sting and advances
-		* the character to the next character after the token
-		 */
-		public function getNextToken():JSONToken {
-			var token:JSONToken = new JSONToken();
-			
-			// skip any whitespace / comments since the last 
-			// token was read
-			skipIgnored();
-						
-			// examine the new character and see what we have...
-			switch ( ch ) {
-				
-				case '{':
-					token.type = JSONTokenType.LEFT_BRACE;
-					token.value = '{';
-					nextChar();
-					break
-					
-				case '}':
-					token.type = JSONTokenType.RIGHT_BRACE;
-					token.value = '}';
-					nextChar();
-					break
-					
-				case '[':
-					token.type = JSONTokenType.LEFT_BRACKET;
-					token.value = '[';
-					nextChar();
-					break
-					
-				case ']':
-					token.type = JSONTokenType.RIGHT_BRACKET;
-					token.value = ']';
-					nextChar();
-					break
-				
-				case ',':
-					token.type = JSONTokenType.COMMA;
-					token.value = ',';
-					nextChar();
-					break
-					
-				case ':':
-					token.type = JSONTokenType.COLON;
-					token.value = ':';
-					nextChar();
-					break;
-					
-				case 't': // attempt to read true
-					var possibleTrue:String = "t" + nextChar() + nextChar() + nextChar();
-					
-					if ( possibleTrue == "true" ) {
-						token.type = JSONTokenType.TRUE;
-						token.value = true;
-						nextChar();
-					} else {
-						parseError( "Expecting 'true' but found " + possibleTrue );
-					}
-					
-					break;
-					
-				case 'f': // attempt to read false
-					var possibleFalse:String = "f" + nextChar() + nextChar() + nextChar() + nextChar();
-					
-					if ( possibleFalse == "false" ) {
-						token.type = JSONTokenType.FALSE;
-						token.value = false;
-						nextChar();
-					} else {
-						parseError( "Expecting 'false' but found " + possibleFalse );
-					}
-					
-					break;
-					
-				case 'n': // attempt to read null
-				
-					var possibleNull:String = "n" + nextChar() + nextChar() + nextChar();
-					
-					if ( possibleNull == "null" ) {
-						token.type = JSONTokenType.NULL;
-						token.value = null;
-						nextChar();
-					} else {
-						parseError( "Expecting 'null' but found " + possibleNull );
-					}
-					
-					break;
-					
-				case '"': // the start of a string
-					token = readString();
-					break;
-					
-				default: 
-					// see if we can read a number
-					if ( isDigit( ch ) || ch == '-' ) {
-						token = readNumber();
-					} else if ( ch == '' ) {
-						// check for reading past the end of the string
-						return null;
-					} else {						
-						// not sure what was in the input string - it's not
-						// anything we expected
-						parseError( "Unexpected " + ch + " encountered" );
-					}
-			}
-			
-			return token;
-		}
-		
-		/**
-		 * Attempts to read a string from the input string.  Places
-		 * the character location at the first character after the
-		 * string.  It is assumed that ch is " before this method is called.
-		 *
-		 * @return the JSONToken with the string value if a string could
-		 *		be read.  Throws an error otherwise.
-		 */
-		private function readString():JSONToken {
-			// the token for the string we'll try to read
-			var token:JSONToken = new JSONToken();
-			token.type = JSONTokenType.STRING;
-			
-			// the string to store the string we'll try to read
-			var string:String = "";
-			
-			// advance past the first "
-			nextChar();
-			
-			while ( ch != '"' && ch != '' ) {
-								
-				// unescape the escape sequences in the string
-				if ( ch == '\\' ) {
-					
-					// get the next character so we know what
-					// to unescape
-					nextChar();
-					
-					switch ( ch ) {
-						
-						case '"': // quotation mark
-							string += '"';
-							break;
-						
-						case '/':	// solidus
-							string += "/";
-							break;
-							
-						case '\\':	// reverse solidus
-							string += '\\';
-							break;
-							
-						case 'b':	// bell
-							string += '\b';
-							break;
-							
-						case 'f':	// form feed
-							string += '\f';
-							break;
-							
-						case 'n':	// newline
-							string += '\n';
-							break;
-							
-						case 'r':	// carriage return
-							string += '\r';
-							break;
-							
-						case 't':	// horizontal tab
-							string += '\t'
-							break;
-						
-						case 'u':
-							// convert a unicode escape sequence
-							// to it's character value - expecting
-							// 4 hex digits
-							
-							// save the characters as a string we'll convert to an int
-							var hexValue:String = "";
-							
-							// try to find 4 hex characters
-							for ( var i:int = 0; i < 4; i++ ) {
-								// get the next character and determine
-								// if it's a valid hex digit or not
-								if ( !isHexDigit( nextChar() ) ) {
-									parseError( " Excepted a hex digit, but found: " + ch );
-								}
-								// valid, add it to the value
-								hexValue += ch;
-							}
-							
-							// convert hexValue to an integer, and use that
-							// integrer value to create a character to add
-							// to our string.
-							string += String.fromCharCode( parseInt( hexValue, 16 ) );
-							
-							break;
-					
-						default:
-							// couldn't unescape the sequence, so just
-							// pass it through
-							string += '\\' + ch;
-						
-					}
-					
-				} else {
-					// didn't have to unescape, so add the character to the string
-					string += ch;
-					
-				}
-				
-				// move to the next character
-				nextChar();
-				
-			}
-			
-			// we read past the end of the string without closing it, which
-			// is a parse error
-			if ( ch == '' ) {
-				parseError( "Unterminated string literal" );
-			}
-			
-			// move past the closing " in the input string
-			nextChar();
-			
-			// attach to the string to the token so we can return it
-			token.value = string;
-			
-			return token;
-		}
-		
-		/**
-		 * Attempts to read a number from the input string.  Places
-		 * the character location at the first character after the
-		 * number.
-		 * 
-		 * @return The JSONToken with the number value if a number could
-		 * 		be read.  Throws an error otherwise.
-		 */
-		private function readNumber():JSONToken {
-			// the token for the number we'll try to read
-			var token:JSONToken = new JSONToken();
-			token.type = JSONTokenType.NUMBER;
-			
-			// the string to accumulate the number characters
-			// into that we'll convert to a number at the end
-			var input:String = "";
-			
-			// check for a negative number
-			if ( ch == '-' ) {
-				input += '-';
-				nextChar();
-			}
-			
-			// read numbers while we can
-			while ( isDigit( ch ) ) {
-				input += ch;
-				nextChar();
-			}
-			
-			// check for a decimal value
-			if ( ch == '.' ) {
-				input += '.';
-				nextChar();
-				// read more numbers to get the decimal value
-				while ( isDigit( ch ) ) {
-					input += ch;
-					nextChar();
-				}
-			}
-			
-			//Application.application.show( "number = " + input );
-			
-			// conver the string to a number value
-			var num:Number = Number( input );
-			
-			if ( isFinite( num ) ) {
-				token.value = num;
-				return token;
-			} else {
-				parseError( "Number " + num + " is not valid!" );
-			}
-            return null;
-		}
-
-		/**
-		 * Reads the next character in the input
-		 * string and advances the character location.
-		 *
-		 * @return The next character in the input string, or
-		 *		null if we've read past the end.
-		 */
-		private function nextChar():String {
-			return ch = jsonString.charAt( loc++ );
-		}
-		
-		/**
-		 * Advances the character location past any
-		 * sort of white space and comments
-		 */
-		private function skipIgnored():void {
-			skipWhite();
-			skipComments();
-			skipWhite();
-		}
-		
-		/**
-		 * Skips comments in the input string, either
-		 * single-line or multi-line.  Advances the character
-		 * to the first position after the end of the comment.
-		 */
-		private function skipComments():void {
-			if ( ch == '/' ) {
-				// Advance past the first / to find out what type of comment
-				nextChar();
-				switch ( ch ) {
-					case '/': // single-line comment, read through end of line
-						
-						// Loop over the characters until we find
-						// a newline or until there's no more characters left
-						do {
-							nextChar();
-						} while ( ch != '\n' && ch != '' )
-						
-						// move past the \n
-						nextChar();
-						
-						break;
-					
-					case '*': // multi-line comment, read until closing */
-
-						// move past the opening *
-						nextChar();
-						
-						// try to find a trailing */
-						while ( true ) {
-							if ( ch == '*' ) {
-								// check to see if we have a closing /
-								nextChar();
-								if ( ch == '/') {
-									// move past the end of the closing */
-									nextChar();
-									break;
-								}
-							} else {
-								// move along, looking if the next character is a *
-								nextChar();
-							}
-							
-							// when we're here we've read past the end of 
-							// the string without finding a closing */, so error
-							if ( ch == '' ) {
-								parseError( "Multi-line comment not closed" );
-							}
-						}
-
-						break;
-					
-					// Can't match a comment after a /, so it's a parsing error
-					default:
-						parseError( "Unexpected " + ch + " encountered (expecting '/' or '*' )" );
-				}
-			}
-			
-		}
-		
-		
-		/**
-		 * Skip any whitespace in the input string and advances
-		 * the character to the first character after any possible
-		 * whitespace.
-		 */
-		private function skipWhite():void {
-			
-			// As long as there are spaces in the input 
-			// stream, advance the current location pointer
-			// past them
-			while ( isSpace( ch ) ) {
-				nextChar();
-			}
-			
-		}
-		
-		/**
-		 * Determines if a character is whitespace or not.
-		 *
-		 * @return True if the character passed in is a whitespace
-		 *	character
-		 */
-		private function isSpace( ch:String ):Boolean {
-			return ( ch == ' ' || ch == '\t' );
-		}
-		
-		/**
-		 * Determines if a character is a digit [0-9].
-		 *
-		 * @return True if the character passed in is a digit
-		 */
-		private function isDigit( ch:String ):Boolean {
-			return ( ch >= '0' && ch <= '9' );
-		}
-		
-		/**
-		 * Determines if a character is a digit [0-9].
-		 *
-		 * @return True if the character passed in is a digit
-		 */
-		private function isHexDigit( ch:String ):Boolean {
-			// get the uppercase value of ch so we only have
-			// to compare the value between 'A' and 'F'
-			var uc:String = ch.toUpperCase();
-			
-			// a hex digit is a digit of A-F, inclusive ( using
-			// our uppercase constraint )
-			return ( isDigit( ch ) || ( uc >= 'A' && uc <= 'F' ) );
-		}
-	
-		/**
-		 * Raises a parsing error with a specified message, tacking
-		 * on the error location and the original string.
-		 *
-		 * @param message The message indicating why the error occurred
-		 */
-		public function parseError( message:String ):void {
-			throw new JSONParseError( message, loc, jsonString );
-		}
-	}
-	
-}
diff --git a/grade/report/visual/flare_visualization/flare/flare.data/flare/data/DataField.as b/grade/report/visual/flare_visualization/flare/flare.data/flare/data/DataField.as
deleted file mode 100644
index b7246e0308..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.data/flare/data/DataField.as
+++ /dev/null
@@ -1,52 +0,0 @@
-package flare.data
-{
-	/**
-	 * Represents metadata for an individual data field.
-	 */
-	public class DataField
-	{
-		private var _id:String;
-		private var _name:String;
-		private var _format:String;
-		private var _label:String;
-		private var _type:int;
-		private var _def:Object;
-		
-		/** A unique id for the data field, often the name. */
-		public function get id():String { return _id; }
-		/** The name of the data field. */
-		public function get name():String { return _name; }
-		/** A formatting string for printing values of this field.
-		 *  @see flare.util.Stings#format
-		 */
-		public function get format():String { return _format; }
-		/** A label describing this data field, useful for axis titles. */
-		public function get label():String { return _label; }
-		/** The data type of this field.
-		 *  @see flare.data.DataUtil. */
-		public function get type():int { return _type; }
-		/** The default value for this data field. */
-		public function get defaultValue():Object { return _def; }
-		
-		/**
-		 * Creates a new DataField.
-		 * @param name the name of the data field
-		 * @param type the data type of this field
-		 * @param def the default value of this field
-		 * @param id a unique id for the field. If null, the name will be used
-		 * @param format a formatting string for printing values of this field
-		 * @param label a label describing this data field
-		 */
-		public function DataField(name:String, type:int, def:Object=null,
-		           id:String=null, format:String=null, label:String=null)
-		{
-			_name = name;
-			_type = type;
-			_def = def;
-			_id = (id==null ? name : id);
-			_format = format;
-			_label = label==null ? name : _label;
-		}
-		
-	} // end of class DataField
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.data/flare/data/DataSchema.as b/grade/report/visual/flare_visualization/flare/flare.data/flare/data/DataSchema.as
deleted file mode 100644
index b3800c716f..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.data/flare/data/DataSchema.as
+++ /dev/null
@@ -1,81 +0,0 @@
-package flare.data
-{
-	import flare.util.Arrays;
-	
-	/**
-	 * A DataSchema represents a set of data variables and their associated 
-	 * types. A schema maintains a collection of <code>DataField</code>
-	 * objects.
-	 * @see flare.data.DataField
-	 */
-	public class DataSchema
-	{
-		public var dataRoot:String = null;
-		public var hasHeader:Boolean = false;
-		
-		private var _fields:/*DataField*/Array = [];
-		private var _nameLookup:/*String->DataField*/Object = {};
-		private var _idLookup:/*String->DataField*/Object = {};
-		
-		/** An array containing the data fields in this schema. */
-		public function get fields():Array { return Arrays.copy(_fields); }
-		/** The number of data fields in this schema. */
-		public function get numFields():int { return _fields.length; }
-		
-		/**
-		 * Creates a new DataSchema.
-		 * @param fields an ordered list of data fields to include in the
-		 * schema
-		 */
-		public function DataSchema(...fields)
-		{
-			for each (var f:DataField in fields) {
-				addField(f);
-			}
-		}
-		
-		/**
-		 * Adds a field to this schema.
-		 * @param field the data field to add
-		 */
-		public function addField(field:DataField):void
-		{
-			_fields.push(field);
-			_nameLookup[field.name] = field;
-			_idLookup[field.id] = field;
-		}
-		
-		/**
-		 * Retrieves a data field by name.
-		 * @param name the data field name
-		 * @return the corresponding data field, or null if no data field is
-		 *  found matching the name
-		 */
-		public function getFieldByName(name:String):DataField
-		{
-			return _nameLookup[name];
-		}
-		
-		/**
-		 * Retrieves a data field by id.
-		 * @param name the data field id
-		 * @return the corresponding data field, or null if no data field is
-		 *  found matching the id
-		 */
-		public function getFieldById(id:String):DataField
-		{
-			return _idLookup[id];
-		}
-		
-		/**
-		 * Retrieves a data field by its index in this schema.
-		 * @param idx the index of the data field in this schema
-		 * @return the corresponding data field
-		 */
-		public function getFieldAt(idx:int):DataField
-		{
-			return _fields[idx];
-		}
-		
-	} // end of class DataSchema
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.data/flare/data/DataSet.as b/grade/report/visual/flare_visualization/flare/flare.data/flare/data/DataSet.as
deleted file mode 100644
index 694821c52a..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.data/flare/data/DataSet.as
+++ /dev/null
@@ -1,26 +0,0 @@
-package flare.data
-{	
-	/**
-	 * A data set is a collection of one or more data tables that represent
-	 * a table or graph data structure.
-	 */
-	public class DataSet
-	{
-		/**
-		 * Creates a new DataSet.
-		 * @param nodes a data table of node data
-		 * @param edges a data table of edge data (optional, for graphs only)
-		 */
-		public function DataSet(nodes:DataTable, edges:DataTable=null) {
-			this.nodes = nodes;
-			this.edges = edges;
-		}
-
-		/** A DataTable of nodes (or table rows). */
-		public var nodes:DataTable = null;
-		
-		/** A DataTable of edges. */
-		public var edges:DataTable = null;
-
-	} // end of class DataSet
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.data/flare/data/DataSource.as b/grade/report/visual/flare_visualization/flare/flare.data/flare/data/DataSource.as
deleted file mode 100644
index c83e7ab1fa..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.data/flare/data/DataSource.as
+++ /dev/null
@@ -1,90 +0,0 @@
-package flare.data
-{
-	import flash.net.URLRequest;
-	import flash.net.URLStream;
-	import flash.utils.IDataInput;
-	import flare.data.converters.IDataConverter;
-	import flash.net.URLLoader;
-	import flash.events.Event;
-	import flare.data.converters.Converters;
-	import flash.utils.ByteArray;
-	import flash.net.URLLoaderDataFormat;
-	import flash.events.ProgressEvent;
-	
-	/**
-	 * The DataSource class provides access to remote data on the Internet.
-	 * A DataSource requires a URL for retrieving a data file, and a format
-	 * string representing the data format. The currently supported formats are
-	 * "tab" (Tab-Delimited Text) and "json" (JavaScript Object Notation).
-	 * Additionally, a DataSource can be given a schema object describing the
-	 * data fields and their types (int, Number, Date, String, etc). If no
-	 * schema is provided, the data converter for the particular format will
-	 * attempt to infer the data types directly from the data itself.
-	 * 
-	 * <p>Once a DataSource has been created, use the <tt>load</tt> method to
-	 * initiate data loading. This method returns a <tt>URLLoader</tt> 
-	 * instance. Add a listener to the URLLoader's COMPLETE event to be
-	 * notified when loading and parsing has been completed. When a COMPLETE
-	 * event is issued, the URLLoader's <tt>data</tt> property will contain the
-	 * loaded and parsed data set.</p>
-	 */
-	public class DataSource
-	{
-		private var _url:String;
-		private var _format:String;
-		private var _schema:DataSchema;
-		
-		/** The URL of the remote data set. */
-		public function get url():String { return _url; }
-		/** The format of the remote data set (e.g., "tab" or "json"). */
-		public function get format():String { return _format; }
-		/** A schema describing the attributes of the data set. */
-		public function get schema():DataSchema { return _schema; }
-		
-		/**
-		 * Creates a new DataSource.
-		 * @param url the URL of the remote data set
-		 * @param format the format of the remote data set (e.g., "tab" or
-		 *  "json")
-		 * @param schema an optional schema describing the attibutes of the
-		 *  data set
-		 */
-		public function DataSource(url:String, format:String, schema:DataSchema=null)
-		{
-			_url = url;
-			_format = format;
-			_schema = schema;
-		}
-		
-		/**
-		 * Initiates loading of the data set. When the load completes, a data
-		 * converter instance is used to convert the retrieved data set into
-		 * ActionScript objects. The parsed data is then available through the
-		 * <code>data</code> property of the returned <code>URLLoader</code>.
-		 * @return a URLLoader instance responsible for loading the data set.
-		 *  Add an event listener for the <code>COMPLETE</code> event to be
-		 *  notified when data loading has completed.
-		 */
-		public function load():URLLoader
-		{
-			var loader:URLLoader = new URLLoader();
-			loader.dataFormat = URLLoaderDataFormat.BINARY;
-			loader.addEventListener(Event.COMPLETE,
-				function(evt:Event):void {
-					var conv:IDataConverter = Converters.lookup(_format);
-					loader.data = conv.read(loader.data, _schema);
-				}
-			);
-			loader.load(new URLRequest(_url));
-			return loader;
-		}
-		
-		/* TODO later -- support streaming data
-		public function stream():URLStream
-		{
-			
-		}
-		*/
-		
-	} // end of class DataSource
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.data/flare/data/DataTable.as b/grade/report/visual/flare_visualization/flare/flare.data/flare/data/DataTable.as
deleted file mode 100644
index cb70338182..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.data/flare/data/DataTable.as
+++ /dev/null
@@ -1,27 +0,0 @@
-package flare.data
-{
-	/**
-	 * A table of data that maintains a collection of data objects, each
-	 * representing a row of data, and an optional data schema describing
-	 * the data variables.
-	 */
-	public class DataTable
-	{
-		/**
-		 * Creates a new data table instance.
-		 * @param data an array of tuples, each tuple is a row of data
-		 * @param schema an optional DataSchema describing the data columns
-		 */
-		public function DataTable(data:Array, schema:DataSchema=null) {
-			this.data = data;
-			this.schema = schema;
-		}
-		
-		/** A DataSchema describing the data columns of the table. */
-		public var schema:DataSchema;
-		
-		/** An array of data objects, each representing a row of data. */
-		public var data:Array;
-		
-	} // end of class DataTable
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.data/flare/data/DataUtil.as b/grade/report/visual/flare_visualization/flare/flare.data/flare/data/DataUtil.as
deleted file mode 100644
index 0ed2484195..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.data/flare/data/DataUtil.as
+++ /dev/null
@@ -1,112 +0,0 @@
-package flare.data
-{
-	/**
-	 * Utility class for parsing and representing data field values.
-	 */
-	public class DataUtil
-	{
-		/** Constant indicating a numeric data type. */
-		public static const NUMBER:int = 0;
-		/** Constant indicating an integer data type. */
-		public static const INT:int    = 1;
-		/** Constant indicating a Date data type. */
-		public static const DATE:int   = 2;
-		/** Constant indicating a String data type. */
-		public static const STRING:int = 3;
-		/** Constant indicating an arbitrary Object data type. */
-		public static const OBJECT:int = 4;
-		/** Constant indicating a boolean data type. */
-		public static const BOOLEAN:int = 5;
-		
-		/**
-		 * Parse an input value given its data type.
-		 * @param val the value to parse
-		 * @param type the data type to parse as
-		 * @return the parsed data value
-		 */
-		public static function parseValue(val:Object, type:int):Object
-		{
-			switch (type) {
-				case NUMBER:
-					return Number(val);
-				case INT:	
-					return int(val);
-				case BOOLEAN:
-					return Boolean(val);
-				case DATE:
-					var t:Number = val is Number ? Number(val) 
-												 : Date.parse(String(val));
-					return isNaN(t) ? null : new Date(t);
-				case STRING:
-					return String(val);
-				default:		return val;
-			}
-		}
-		
-		/**
-		 * Returns the data type for the input string value. This method
-		 * attempts to parse the value as a number of different data types.
-		 * If successful, the matching data type is returned. If no parse
-		 * succeeds, this method returns the <code>STRING</code> constant.
-		 * @param s the string to parse
-		 * @return the inferred data type of the string contents
-		 */
-		public static function type(s:String):int
-		{
-			if (!isNaN(Number(s))) return NUMBER;
-			if (!isNaN(Date.parse(s))) return DATE;
-			return STRING;
-		}
-		
-		/**
-		 * Infers the data schema by checking values of the input data.
-		 * @param lines an array of lines of input text
-		 * @return the inferred schema
-		 */
-		public static function inferSchema(tuples:Array):DataSchema
-		{
-			if (tuples==null || tuples.length==0) return null;
-			
-			var header:Array = [];
-			for (var name:String in tuples[0]) {
-				header.push(name);
-			}
-			var types:Array = new Array(header.length);
-			
-			// initialize data types
-			for (var col:int=0; col<header.length; ++col) {
-				types[col] = DataUtil.type(tuples[0][header[col]]);
-			}
-			
-			// now process data to infer types
-			for (var i:int = 2; i<tuples.length; ++i) {
-				var tuple:Object = tuples[i];
-				for (col=0; col<header.length; ++col) {
-					name = header[col];
-					var value:Object = tuple[name];
-					if (types[col] == -1 || value==null) continue;
-					
-					var type:int = 
-						value is Boolean ? BOOLEAN :
-						value is Date ? DATE :
-						value is int ? INT :
-						value is Number ? NUMBER :
-						value is String ? STRING : OBJECT;
-
-					if (types[col] != type) {
-						types[col] = -1;
-					}
-				}
-			}
-			
-			// finally, we create the schema
-			var schema:DataSchema = new DataSchema();
-			for (col=0; col<header.length; ++col) {
-				schema.addField(new DataField(header[col],
-					types[col]==-1 ? DataUtil.STRING : types[col]));
-			}
-			return schema;
-		}
-		
-	} // end of class DataUtil
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.data/flare/data/converters/Converters.as b/grade/report/visual/flare_visualization/flare/flare.data/flare/data/converters/Converters.as
deleted file mode 100644
index 2d22e15973..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.data/flare/data/converters/Converters.as
+++ /dev/null
@@ -1,27 +0,0 @@
-package flare.data.converters
-{	
-	/**
-	 * Factory class for looking up the appropriate IDataConverter for a
-	 * given data format.
-	 */
-	public class Converters
-	{
-		private static var _lookup:Object = {
-			"json":new JSONConverter(),
-			"tab":new DelimitedTextConverter("\t"),
-			"graphml":new GraphMLConverter()
-		};
-		
-		/**
-		 * Returns a data converter for the input format type.
-		 * @param type a format string (e.g., "tab" or "json").
-		 * @return a data converter for the provided format, or null if no
-		 *  matching converter was found.
-		 */
-		public static function lookup(type:String):IDataConverter
-		{
-			return _lookup[type.toLowerCase()];
-		}
-		
-	} // end of class Converters
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.data/flare/data/converters/DelimitedTextConverter.as b/grade/report/visual/flare_visualization/flare/flare.data/flare/data/converters/DelimitedTextConverter.as
deleted file mode 100644
index 2fb5a4e760..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.data/flare/data/converters/DelimitedTextConverter.as
+++ /dev/null
@@ -1,143 +0,0 @@
-package flare.data.converters
-{
-	import flare.data.DataField;
-	import flare.data.DataSchema;
-	import flare.data.DataSet;
-	import flare.data.DataTable;
-	import flare.data.DataUtil;
-	
-	import flash.utils.ByteArray;
-	import flash.utils.IDataInput;
-	import flash.utils.IDataOutput;
-
-	/**
-	 * Converts data between delimited text (e.g., tab delimited) and
-	 * flare DataSet instances.
-	 */
-	public class DelimitedTextConverter implements IDataConverter
-	{
-		private var _delim:String;
-		
-		public function get delimiter():String { return _delim; }
-		public function set delimiter(d:String):void { _delim = d; }
-		
-		/**
-		 * Creates a new DelimitedTextConverter.
-		 * @param delim the delimiter string separating values (tab by default)
-		 */
-		public function DelimitedTextConverter(delim:String="\t")
-		{
-			_delim = delim;
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public function read(input:IDataInput, schema:DataSchema=null):DataSet
-		{
-			return parse(input.readUTFBytes(input.bytesAvailable), schema);
-		}
-		
-		/**
-		 * Converts data from a tab-delimited string into ActionScript objects.
-		 * @param input the loaded input data
-		 * @param schema a data schema describing the structure of the data.
-		 *  Schemas are optional in many but not all cases.
-		 * @param data an array in which to write the converted data objects.
-		 *  If this value is null, a new array will be created.
-		 * @return an array of converted data objects. If the <code>data</code>
-		 *  argument is non-null, it is returned.
-		 */
-		public function parse(text:String, schema:DataSchema=null):DataSet
-		{
-			var tuples:Array = [];
-			var lines:Array = text.split(/\r\n|\r|\n/);
-			
-			if (schema == null) {
-				schema = inferSchema(lines);
-			}
-			
-			var i:int = schema.hasHeader ? 1 : 0;
-			for (; i<lines.length; ++i) {
-				var line:String = lines[i];
-				if (line.length == 0) break;
-				var tok:Array = line.split(_delim);
-				var tuple:Object = {};
-				for (var j:int=0; j<schema.numFields; ++j) {
-					var field:DataField = schema.getFieldAt(j);
-					tuple[field.name] = DataUtil.parseValue(tok[j], field.type);
-				}
-				tuples.push(tuple);
-			}
-			return new DataSet(new DataTable(tuples, schema));
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public function write(data:DataSet, output:IDataOutput=null):IDataOutput
-		{
-			if (output==null) output = new ByteArray();
-			var tuples:Array = data.nodes.data;
-			var schema:DataSchema = data.nodes.schema;
-			
-			for each (var tuple:Object in tuples) {
-				var i:int = 0, s:String;
-				if (schema == null) {
-					for (var name:String in tuple) {
-						if (i>0) output.writeUTFBytes(_delim);
-						output.writeUTFBytes(String(tuple[name])); // TODO: proper string formatting
-						++i;
-					}
-				} else {
-					for (;i<schema.numFields; ++i) {
-						var f:DataField = schema.getFieldAt(i);
-						if (i>0) output.writeUTFBytes(_delim);
-						output.writeUTFBytes(String(tuple[f.name])); // TODO proper string formatting
-					}
-				}
-				output.writeUTFBytes("\n");
-			}
-			return output;
-		}
-		
-		/**
-		 * Infers the data schema by checking values of the input data.
-		 * @param lines an array of lines of input text
-		 * @return the inferred schema
-		 */
-		protected function inferSchema(lines:Array):DataSchema
-		{
-			var header:Array = lines[0].split(_delim);
-			var types:Array = new Array(header.length);
-			
-			// initialize data types
-			var tok:Array = lines[1].split(_delim);
-			for (var col:int=0; col<header.length; ++col) {
-				types[col] = DataUtil.type(tok[col]);
-			}
-			
-			// now process data to infer types
-			for (var i:int = 2; i<lines.length; ++i) {
-				tok = lines[i].split(_delim);
-				for (col=0; col<tok.length; ++col) {
-					if (types[col] == -1) continue;
-					var type:int = DataUtil.type(tok[col]);
-					if (types[col] != type) {
-						types[col] = -1;
-					}
-				}
-			}
-			
-			// finally, we create the schema
-			var schema:DataSchema = new DataSchema();
-			schema.hasHeader = true;
-			for (col=0; col<header.length; ++col) {
-				schema.addField(new DataField(header[col],
-					types[col]==-1 ? DataUtil.STRING : types[col]));
-			}
-			return schema;
-		}
-		
-	} // end of class DelimitedTextConverter
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.data/flare/data/converters/GraphMLConverter.as b/grade/report/visual/flare_visualization/flare/flare.data/flare/data/converters/GraphMLConverter.as
deleted file mode 100644
index cf6f4d6728..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.data/flare/data/converters/GraphMLConverter.as
+++ /dev/null
@@ -1,292 +0,0 @@
-package flare.data.converters
-{
-	import flare.data.DataField;
-	import flare.data.DataSchema;
-	import flare.data.DataSet;
-	import flare.data.DataTable;
-	import flare.data.DataUtil;
-	
-	import flash.utils.ByteArray;
-	import flash.utils.IDataInput;
-	import flash.utils.IDataOutput;
-
-	/**
-	 * Converts data between GraphML markup and flare DataSet instances.
-	 * <a href="http://graphml.graphdrawing.org/">GraphML</a> is a
-	 * standardized XML format supporting graph structure and typed data
-	 * schemas for both nodes and edges.
-	 */
-	public class GraphMLConverter implements IDataConverter
-	{    
-		// -- reader ----------------------------------------------------------
-		
-		/** @inheritDoc */
-		public function read(input:IDataInput, schema:DataSchema=null):DataSet
-		{
-			return parse(XML(input.readUTFBytes(input.bytesAvailable)), schema);
-		}
-		
-		/**
-		 * Parses a GraphML XML object into a DataSet instance.
-		 * @param graphml the XML object containing GraphML markup
-		 * @param schema a DataSchema (typically null, as GraphML contains
-		 *  schema information)
-		 * @return the parsed DataSet instance
-		 */
-		public function parse(graphml:XML, schema:DataSchema=null):DataSet
-		{
-			var lookup:Object = {};
-			var nodes:Array = [], n:Object;
-			var edges:Array = [], e:Object;
-			var id:String, sid:String, tid:String;
-			var def:Object, type:int;
-			var group:String, attrName:String, attrType:String;
-			
-			var nodeSchema:DataSchema = new DataSchema();
-			var edgeSchema:DataSchema = new DataSchema();
-			var schema:DataSchema;
-			
-			// set schema defaults
-			nodeSchema.addField(new DataField(ID, DataUtil.STRING));
-			edgeSchema.addField(new DataField(ID, DataUtil.STRING));
-			edgeSchema.addField(new DataField(SOURCE, DataUtil.STRING));
-			edgeSchema.addField(new DataField(TARGET, DataUtil.STRING));
-			edgeSchema.addField(new DataField(DIRECTED, DataUtil.BOOLEAN,
-									DIRECTED == graphml.graph.@edgedefault));
-			
-			// parse data schema
-			for each (var key:XML in graphml..key) {
-				id       = key.@[ID].toString();
-				group    = key.@[FOR].toString();
-				attrName = key.@[ATTRNAME].toString();
-				type     = toType(key.@[ATTRTYPE].toString());
-				def = key[DEFAULT].toString();
-				def = def != null && def.length > 0
-					? DataUtil.parseValue(def, type) : null;
-				
-				schema = (group==EDGE ? edgeSchema : nodeSchema);
-				schema.addField(new DataField(attrName, type, def, id));
-			}
-			
-			// parse nodes
-			for each (var node:XML in graphml..node) {
-				id = node.@[ID].toString();
-				lookup[id] = (n = parseData(node, nodeSchema));
-				nodes.push(n);
-			}
-			
-			// parse edges
-			for each (var edge:XML in graphml..edge) {
-				id  = edge.@[ID].toString();
-				sid = edge.@[SOURCE].toString();
-				tid = edge.@[TARGET].toString();
-				
-				// error checking
-				if (!lookup.hasOwnProperty(sid))
-					error("Edge "+id+" references unknown node: "+sid);
-				if (!lookup.hasOwnProperty(tid))
-					error("Edge "+id+" references unknown node: "+tid);
-								
-				edges.push(e = parseData(edge, edgeSchema));
-			}
-			
-			return new DataSet(
-				new DataTable(nodes, nodeSchema),
-				new DataTable(edges, edgeSchema)
-			);
-		}
-		
-		private function parseData(node:XML, schema:DataSchema):Object {
-			var n:Object = {};
-			var name:String, field:DataField, value:Object;
-			
-			// set default values
-			for (var i:int=0; i<schema.numFields; ++i) {
-				field = schema.getFieldAt(i);
-				n[field.name] = field.defaultValue;
-			}
-			
-			// get attribute values
-			for each (var attr:XML in node.@*) {
-				name = attr.name().toString();
-				field = schema.getFieldByName(name);
-				n[name] = DataUtil.parseValue(attr[0].toString(), field.type);
-			}
-			
-			// get data values in XML
-			for each (var data:XML in node.data) {
-				field = schema.getFieldById(data.@[KEY].toString());
-				name = field.name;
-				n[name] = DataUtil.parseValue(data[0].toString(), field.type);
-			}
-			
-			return n;
-		}
-
-		// -- writer ----------------------------------------------------------
-		
-		/** @inheritDoc */
-		public function write(data:DataSet, output:IDataOutput=null):IDataOutput
-		{			
-			// init GraphML
-			var graphml:XML = new XML(GRAPHML_HEADER);
-			
-			// add schema
-			graphml = addSchema(graphml, data.nodes.schema, NODE, NODE_ATTR);
-			graphml = addSchema(graphml, data.edges.schema, EDGE, EDGE_ATTR);
-			
-			// add graph data
-			var graph:XML = new XML(<graph/>);
-			var ed:Object = data.edges.schema.getFieldByName(DIRECTED).defaultValue;
-			graph.@[EDGEDEF] = ed==DIRECTED ? DIRECTED : UNDIRECTED;
-			addData(graph, data.nodes.data, data.nodes.schema, NODE, NODE_ATTR);
-			addData(graph, data.edges.data, data.edges.schema, EDGE, EDGE_ATTR);
-			graphml = graphml.appendChild(graph);
-			
-			if (output == null) output = new ByteArray();
-			output.writeUTFBytes(graphml.toXMLString());
-			return output;
-		}
-		
-		private static function addSchema(xml:XML, schema:DataSchema,
-			group:String, attrs:Object):XML
-		{
-			var field:DataField;
-			
-			for (var i:int=0; i<schema.numFields; ++i) {
-				field = schema.getFieldAt(i);
-				if (attrs.hasOwnProperty(field.name)) continue;
-				
-				var key:XML = new XML(<key/>);
-				key.@[ID] = field.id;
-				key.@[FOR] = group;
-				key.@[ATTRNAME] = field.name;
-				key.@[ATTRTYPE] = fromType(field.type);
-			
-				if (field.defaultValue != null) {
-					var def:XML = new XML(<default/>);
-					def.appendChild(toString(field.defaultValue, field.type));
-					key.appendChild(def);
-				}
-				
-				xml = xml.appendChild(key);
-			}
-			return xml;
-		}
-		
-		private static function addData(xml:XML, tuples:Array,
-			schema:DataSchema, tag:String, attrs:Object):void
-		{
-			for each (var tuple:Object in tuples) {
-				var x:XML = new XML("<"+tag+"/>");
-				
-				for (var name:String in tuple) {
-					var field:DataField = schema.getFieldByName(name);
-					if (tuple[name] == field.defaultValue) continue;
-					if (attrs.hasOwnProperty(name)) {
-						// add as attribute
-						x.@[name] = toString(tuple[name], field.type);
-					} else {
-						// add as data child tag
-						var data:XML = new XML(<data/>);
-						data.@[KEY] = field.id;
-						data.appendChild(toString(tuple[name], field.type));
-						x.appendChild(data);
-					}
-				}
-				
-				xml.appendChild(x);
-			}
-		}	
-		
-		// -- static helpers --------------------------------------------------
-		
-		private static function toString(o:Object, type:int):String
-		{
-			return o.toString(); // TODO: formatting control?
-		}
-		
-		private static function toType(type:String):int {
-			switch (type) {
-				case INT:
-				case INTEGER:
-					return DataUtil.INT;
-				case LONG:
-				case FLOAT:
-				case DOUBLE:
-				case REAL:
-					return DataUtil.NUMBER;
-				case BOOLEAN:
-					return DataUtil.BOOLEAN;
-				case DATE:
-					return DataUtil.DATE;
-				case STRING:
-				default:
-					return DataUtil.STRING;
-			}
-		}
-		
-		private static function fromType(type:int):String {
-			switch (type) {
-				case DataUtil.INT: 		return INT;
-				case DataUtil.BOOLEAN: 	return BOOLEAN;
-				case DataUtil.NUMBER:	return DOUBLE;
-				case DataUtil.DATE:		return DATE;
-				case DataUtil.STRING:
-				default:				return STRING;
-			}
-		}
-		
-		private static function error(msg:String):void {
-			throw new Error(msg);
-		}
-		
-		// -- constants -------------------------------------------------------
-		
-		private static const NODE_ATTR:Object = {
-			"id":1
-		}
-		private static const EDGE_ATTR:Object = {
-			"id":1, "directed":1, "source":1, "target":1
-		};
-		
-		private static const GRAPHML_HEADER:String = "<graphml/>";
-		//	"<graphml xmlns=\"http://graphml.graphdrawing.org/xmlns\"" 
-        //    +" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""
-        //    +" xsi:schemaLocation=\"http://graphml.graphdrawing.org/xmlns"
-        //    +" http://graphml.graphdrawing.org/xmlns/1.0/graphml.xsd\">"
-        //    +"</graphml>";
-        
-        private static const GRAPHML:String    = "graphml";
-		private static const ID:String         = "id";
-	    private static const GRAPH:String      = "graph";
-	    private static const EDGEDEF:String    = "edgedefault";
-	    private static const DIRECTED:String   = "directed";
-	    private static const UNDIRECTED:String = "undirected";
-	    
-	    private static const KEY:String        = "key";
-	    private static const FOR:String        = "for";
-	    private static const ALL:String        = "all";
-	    private static const ATTRNAME:String   = "attr.name";
-	    private static const ATTRTYPE:String   = "attr.type";
-	    private static const DEFAULT:String    = "default";
-	    
-	    private static const NODE:String   = "node";
-	    private static const EDGE:String   = "edge";
-	    private static const SOURCE:String = "source";
-	    private static const TARGET:String = "target";
-	    private static const DATA:String   = "data";
-	    private static const TYPE:String   = "type";
-	    
-	    private static const INT:String = "int";
-	    private static const INTEGER:String = "integer";
-	    private static const LONG:String = "long";
-	    private static const FLOAT:String = "float";
-	    private static const DOUBLE:String = "double";
-	    private static const REAL:String = "real";
-	    private static const BOOLEAN:String = "boolean";
-	    private static const STRING:String = "string";
-	    private static const DATE:String = "date";
-		
-	} // end of class GraphMLConverter
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.data/flare/data/converters/IDataConverter.as b/grade/report/visual/flare_visualization/flare/flare.data/flare/data/converters/IDataConverter.as
deleted file mode 100644
index 47ad8bd0eb..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.data/flare/data/converters/IDataConverter.as
+++ /dev/null
@@ -1,36 +0,0 @@
-package flare.data.converters
-{
-	import flare.data.DataSchema;
-	import flare.data.DataSet;
-	
-	import flash.utils.IDataInput;
-	import flash.utils.IDataOutput;
-	
-	/**
-	 * Interface for data converters that map between an external data file
-	 * format and ActionScript objects (e.g., Arrays and Objects).
-	 */
-	public interface IDataConverter
-	{
-		/**
-		 * Converts data from an external format into ActionScript objects.
-		 * @param input the loaded input data
-		 * @param schema a data schema describing the structure of the data.
-		 *  Schemas are optional in many but not all cases.
-		 * @return a DataSet instance containing converted data objects.
-		 */
-		function read(input:IDataInput, schema:DataSchema=null):DataSet;
-		
-		/**
-		 * Converts data from ActionScript objects into an external format.
-		 * @param data the data set to write.
-		 * @param output an object to which to write the output. If this value
-		 *  is null, a new <code>ByteArray</code> will be created.
-		 * @return the converted data. If the <code>output</code> parameter is
-		 *  non-null, it is returned. Otherwise the return value will be a
-		 *  newly created <code>ByteArray</code>
-		 */
-		function write(data:DataSet, output:IDataOutput=null):IDataOutput;
-		
-	} // end of interface IDataConverter
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.data/flare/data/converters/JSONConverter.as b/grade/report/visual/flare_visualization/flare/flare.data/flare/data/converters/JSONConverter.as
deleted file mode 100644
index ffc810307b..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.data/flare/data/converters/JSONConverter.as
+++ /dev/null
@@ -1,76 +0,0 @@
-package flare.data.converters
-{
-	import com.adobe.serialization.json.JSON;
-	
-	import flare.data.DataField;
-	import flare.data.DataSchema;
-	import flare.data.DataSet;
-	import flare.data.DataTable;
-	import flare.data.DataUtil;
-	import flare.util.Property;
-	
-	import flash.utils.ByteArray;
-	import flash.utils.IDataInput;
-	import flash.utils.IDataOutput;
-
-	/**
-	 * Converts data between JSON (JavaScript Object Notation) strings and
-	 * flare DataSet instances.
-	 */
-	public class JSONConverter implements IDataConverter
-	{
-		/**
-		 * @inheritDoc
-		 */
-		public function read(input:IDataInput, schema:DataSchema=null):DataSet
-		{
-			var data:Array;
-			return new DataSet(new DataTable(
-				data = parse(input.readUTFBytes(input.bytesAvailable), schema),
-				schema ? schema : DataUtil.inferSchema(data)
-			));
-		}
-		
-		/**
-		 * Converts data from a JSON string into ActionScript objects.
-		 * @param input the loaded input data
-		 * @param schema a data schema describing the structure of the data.
-		 *  Schemas are optional in many but not all cases.
-		 * @param data an array in which to write the converted data objects.
-		 *  If this value is null, a new array will be created.
-		 * @return an array of converted data objects. If the <code>data</code>
-		 *  argument is non-null, it is returned.
-		 */
-		public function parse(text:String, schema:DataSchema):Array
-		{
-			var json:Object = JSON.decode(text) as Object;
-			var list:Array = json as Array;
-			
-			if (schema != null) {
-				if (schema.dataRoot) {
-					// if nested, extract data array
-					list = Property.$(schema.dataRoot).getValue(json);
-				}
-				// convert value types according to schema
-				for each (var t:Object in list) {
-					for each (var f:DataField in schema.fields) {
-						t[f.name] = DataUtil.parseValue(t[f.name], f.type);
-					}
-				}
-			}
-			return list;
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public function write(data:DataSet, output:IDataOutput=null):IDataOutput
-		{
-			var tuples:Array = data.nodes.data;
-			if (output==null) output = new ByteArray();
-			output.writeUTFBytes(JSON.encode(tuples));
-			return output;
-		}
-		
-	} // end of class JSONConverter
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.demos/.actionScriptProperties b/grade/report/visual/flare_visualization/flare/flare.demos/.actionScriptProperties
deleted file mode 100644
index af3a82b4a0..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.demos/.actionScriptProperties
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<actionScriptProperties mainApplicationPath="demos.as" version="3">
-  <compiler additionalCompilerArguments="" copyDependentFiles="true" enableModuleDebug="true" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="true" htmlHistoryManagement="true" htmlPlayerVersion="9.0.28" htmlPlayerVersionCheck="true" outputFolderPath="bin" strict="true" useApolloConfig="false" verifyDigests="true" warn="true">
-    <compilerSourcePath/>
-    <libraryPath defaultLinkType="1">
-      <libraryPathEntry kind="4" path="">
-        <excludedEntries>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation_charts.swc" useDefaultLinkType="false"/>
-          <libraryPathEntry kind="1" linkType="1" path="${PROJECT_FRAMEWORKS}/locale/{locale}"/>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/qtp.swc" useDefaultLinkType="false"/>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/charts.swc" useDefaultLinkType="false"/>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/rpc.swc" useDefaultLinkType="false"/>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/datavisualization.swc" useDefaultLinkType="false"/>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/framework.swc" useDefaultLinkType="false"/>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation.swc" useDefaultLinkType="false"/>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation_dmv.swc" useDefaultLinkType="false"/>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation_agent.swc" useDefaultLinkType="false"/>
-        </excludedEntries>
-      </libraryPathEntry>
-      <libraryPathEntry kind="3" linkType="1" path="/flare.animate/bin/flare.animate.swc" useDefaultLinkType="false"/>
-      <libraryPathEntry kind="3" linkType="1" path="/flare.physics/bin/flare.physics.swc" useDefaultLinkType="false"/>
-      <libraryPathEntry kind="3" linkType="1" path="/flare.util/bin/flare.util.swc" useDefaultLinkType="false"/>
-      <libraryPathEntry kind="3" linkType="1" path="/flare.vis/bin/flare.vis.swc" useDefaultLinkType="false"/>
-      <libraryPathEntry kind="3" linkType="1" path="/flare.data/bin/flare.data.swc" useDefaultLinkType="false"/>
-    </libraryPath>
-    <sourceAttachmentPath/>
-  </compiler>
-  <applications>
-    <application path="demos.as"/>
-  </applications>
-  <modules/>
-  <buildCSSFiles/>
-</actionScriptProperties>
diff --git a/grade/report/visual/flare_visualization/flare/flare.demos/.project b/grade/report/visual/flare_visualization/flare/flare.demos/.project
deleted file mode 100644
index 380e4e1e80..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.demos/.project
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>flare.demos</name>
-	<comment></comment>
-	<projects>
-		<project>flare.animate</project>
-		<project>flare.physics</project>
-		<project>flare.util</project>
-		<project>flare.vis</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.adobe.flexbuilder.project.flexbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.adobe.flexbuilder.project.actionscriptnature</nature>
-	</natures>
-</projectDescription>
diff --git a/grade/report/visual/flare_visualization/flare/flare.demos/FlareLogo.as b/grade/report/visual/flare_visualization/flare/flare.demos/FlareLogo.as
deleted file mode 100644
index d82f36551d..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.demos/FlareLogo.as
+++ /dev/null
@@ -1,141 +0,0 @@
-package
-{
-	import flash.display.Sprite;
-	import flare.animate.Transitioner;
-	import flash.display.DisplayObject;
-	import flare.animate.Sequence;
-	import flare.animate.Tween;
-	import flare.animate.Easing;
-	import flash.filters.GlowFilter;
-	import flare.animate.Pause;
-	import flare.animate.Transition;
-	import flare.animate.Parallel;
-
-	public class FlareLogo extends Sprite
-	{
-		private var points:Array = [
-		/*f*/ 0,2, 1,1, 1,2, 1,3, 1,4, 1,5, 1,6, 1,7, 2,0, 2,2, 3,0, 3,2, 
-		/*l*/ 5,0, 5,7, 6,0, 6,1, 6,2, 6,3, 6,4, 6,5, 6,6, 6,7, 7,7, 
-		/*a*/ 9,5, 9,6, 10,2, 10,4, 10,7, 11,2, 11,4, 11,7, 12,2, 12,4, 12,6, 13,3, 13,4, 13,5, 13,6, 13,7, 
-		/*r*/ 15,2, 15,3, 15,4, 15,5, 15,6, 15,7, 16,3, 17,2, 18,2, 19,3, 
-		/*e*/ 21,3, 21,4, 21,5, 21,6, 22,2, 22,4, 22,7, 23,2, 23,4, 23,7, 24,2, 24,4, 24,7, 25,3, 25,4, 25,7
-		];
-		
-		private var w:Number = 10;
-		private var h:Number = 10;
-		private var xb:Number = -25/2;
-		private var yb:Number = -7/2;
-		
-		private var _dance:Transition;
-		private var _glow:Transition;
-		
-		public function FlareLogo()
-		{
-			var inc:Number = 2, linc:Number = 4;
-			var con:Sprite = new Sprite();
-			for (var i:int=0; i<points.length; i+=2) {
-				var s:Sprite = new Sprite();
-				s.graphics.beginFill(0, 1);
-				s.graphics.drawRect(-(w+inc)/2,-(h+inc)/2,w+inc,h+inc);
-				s.graphics.endFill();
-				con.addChild(s);
-			}
-			addChild(con);
-			
-			layoutT(con, Transitioner.DEFAULT, 0);
-			var seq:Sequence = new Sequence(
-				new Pause(6),
-				layoutT(con, new Transitioner(3), linc),
-				layoutY(con, new Transitioner(2,Easing.easeOutBounce), linc),
-				new Pause(1),
-				layoutC(con, new Transitioner(3,Easing.easeInPoly(3)), linc),
-				new Tween(con, 6, {rotation:180}, false, Easing.easeInPoly(3)),
-				new Parallel(
-					new Tween(con, 6, {rotation:360}, false, Easing.easeOutPoly(3)),
-					layoutX(con, new Transitioner(6), linc)
-				),
-				new Tween(con, 0, {rotation:0}),
-				layoutT(con, new Transitioner(3), linc),
-				layoutT(con, new Transitioner(3), 0),
-				new Pause(21)
-			);
-			seq.onEnd = function():void { seq.play(); }
-			_dance = seq;
-			
-			// do the glow...
-			con.filters = [new GlowFilter(0xff0000, 0.5, 0, 0)];
-			var g1:Tween = new Tween(con,3,{"filters[0].blurX":15,"filters[0].blurY":15});
-			var g2:Tween = new Tween(con,3,{"filters[0].blurX":0,"filters[0].blurY":0});
-			g1.easing = g2.easing = Easing.none;
-			
-			var glow:Sequence = new Sequence(g1,g2);
-			glow.easing = Easing.easeInOutPoly(2);
-			glow.onEnd = function():void { glow.play(); }
-			_glow = glow;
-		}
-		
-		public function play():void {
-			_dance.play();
-			_glow.play();
-		}
-		
-		public function pause():void {
-			_dance.pause();
-			_glow.pause();
-		}
-		
-		private function layoutT(s:Sprite, t:Transitioner, a:Number):Transitioner
-		{
-			for (var i:int=0; i<s.numChildren; ++i) {
-				var b:DisplayObject = s.getChildAt(i);
-				t.$(b).x = (w+a) * (xb + points[2*i]);
-				t.$(b).y = (h+a) * (yb + points[2*i+1]);
-			}
-			return t;
-		}
-		
-		private function layoutX(s:Sprite, t:Transitioner, a:Number):Transitioner
-		{
-			var xc:Object = {}; for (var i:int=0; i<8; ++i) xc[i] = 0;
-			
-			for (i=0; i<s.numChildren; ++i) {
-				var b:DisplayObject = s.getChildAt(i);
-				t.$(b).x = 100 + (w+a) * (xb + xc[points[2*i+1]]);
-				t.$(b).y = (h+a) * (yb + points[2*i+1]);
-				xc[points[2*i+1]]++;
-			}
-			return t;
-		}
-		
-		private function layoutY(s:Sprite, t:Transitioner, a:Number):Transitioner
-		{
-			var yc:Object = {}; for (var i:int=0; i<26; ++i) yc[i] = 7;
-			
-			for (i=s.numChildren; --i>=0;) {
-				var b:DisplayObject = s.getChildAt(i);
-				t.$(b).x = (w+a) * (xb + points[2*i]);
-				t.$(b).y = (h+a) * (yb + yc[points[2*i]]);
-				yc[points[2*i]]--;
-			}
-			return t;
-		}
-		
-		private function layoutC(s:Sprite, t:Transitioner, a:Number):Transitioner
-		{
-			var sort:Array = new Array(s.numChildren);
-			for (var i:int=0; i<s.numChildren; ++i) {
-				var b:DisplayObject = s.getChildAt(i);
-				sort[i] = Math.atan2(b.y, b.x);
-			}
-			sort = sort.sort(Array.NUMERIC | Array.RETURNINDEXEDARRAY);
-			
-			for (i=0; i<sort.length; ++i) {
-				var f:Number = 1.0 - i / s.numChildren;
-				b = s.getChildAt(sort[i]);
-				t.$(b).x = -200 * Math.cos(2*Math.PI*f);
-				t.$(b).y =  200 * Math.sin(2*Math.PI*f);
-			}
-			return t;
-		}
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.demos/bin/AC_OETags.js b/grade/report/visual/flare_visualization/flare/flare.demos/bin/AC_OETags.js
deleted file mode 100644
index 2fb2fe9823..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.demos/bin/AC_OETags.js
+++ /dev/null
@@ -1,275 +0,0 @@
-// Flash Player Version Detection - Rev 1.6
-// Detect Client Browser type
-// Copyright(c) 2005-2006 Adobe Macromedia Software, LLC. All rights reserved.
-var isIE  = (navigator.appVersion.indexOf("MSIE") != -1) ? true : false;
-var isWin = (navigator.appVersion.toLowerCase().indexOf("win") != -1) ? true : false;
-var isOpera = (navigator.userAgent.indexOf("Opera") != -1) ? true : false;
-
-function ControlVersion()
-{
-	var version;
-	var axo;
-	var e;
-
-	// NOTE : new ActiveXObject(strFoo) throws an exception if strFoo isn't in the registry
-
-	try {
-		// version will be set for 7.X or greater players
-		axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.7");
-		version = axo.GetVariable("$version");
-	} catch (e) {
-	}
-
-	if (!version)
-	{
-		try {
-			// version will be set for 6.X players only
-			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.6");
-			
-			// installed player is some revision of 6.0
-			// GetVariable("$version") crashes for versions 6.0.22 through 6.0.29,
-			// so we have to be careful. 
-			
-			// default to the first public version
-			version = "WIN 6,0,21,0";
-
-			// throws if AllowScripAccess does not exist (introduced in 6.0r47)		
-			axo.AllowScriptAccess = "always";
-
-			// safe to call for 6.0r47 or greater
-			version = axo.GetVariable("$version");
-
-		} catch (e) {
-		}
-	}
-
-	if (!version)
-	{
-		try {
-			// version will be set for 4.X or 5.X player
-			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.3");
-			version = axo.GetVariable("$version");
-		} catch (e) {
-		}
-	}
-
-	if (!version)
-	{
-		try {
-			// version will be set for 3.X player
-			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.3");
-			version = "WIN 3,0,18,0";
-		} catch (e) {
-		}
-	}
-
-	if (!version)
-	{
-		try {
-			// version will be set for 2.X player
-			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash");
-			version = "WIN 2,0,0,11";
-		} catch (e) {
-			version = -1;
-		}
-	}
-	
-	return version;
-}
-
-// JavaScript helper required to detect Flash Player PlugIn version information
-function GetSwfVer(){
-	// NS/Opera version >= 3 check for Flash plugin in plugin array
-	var flashVer = -1;
-	
-	if (navigator.plugins != null && navigator.plugins.length > 0) {
-		if (navigator.plugins["Shockwave Flash 2.0"] || navigator.plugins["Shockwave Flash"]) {
-			var swVer2 = navigator.plugins["Shockwave Flash 2.0"] ? " 2.0" : "";
-			var flashDescription = navigator.plugins["Shockwave Flash" + swVer2].description;
-			var descArray = flashDescription.split(" ");
-			var tempArrayMajor = descArray[2].split(".");			
-			var versionMajor = tempArrayMajor[0];
-			var versionMinor = tempArrayMajor[1];
-			var versionRevision = descArray[3];
-			if (versionRevision == "") {
-				versionRevision = descArray[4];
-			}
-			if (versionRevision[0] == "d") {
-				versionRevision = versionRevision.substring(1);
-			} else if (versionRevision[0] == "r") {
-				versionRevision = versionRevision.substring(1);
-				if (versionRevision.indexOf("d") > 0) {
-					versionRevision = versionRevision.substring(0, versionRevision.indexOf("d"));
-				}
-			}
-			var flashVer = versionMajor + "." + versionMinor + "." + versionRevision;
-		}
-	}
-	// MSN/WebTV 2.6 supports Flash 4
-	else if (navigator.userAgent.toLowerCase().indexOf("webtv/2.6") != -1) flashVer = 4;
-	// WebTV 2.5 supports Flash 3
-	else if (navigator.userAgent.toLowerCase().indexOf("webtv/2.5") != -1) flashVer = 3;
-	// older WebTV supports Flash 2
-	else if (navigator.userAgent.toLowerCase().indexOf("webtv") != -1) flashVer = 2;
-	else if ( isIE && isWin && !isOpera ) {
-		flashVer = ControlVersion();
-	}	
-	return flashVer;
-}
-
-// When called with reqMajorVer, reqMinorVer, reqRevision returns true if that version or greater is available
-function DetectFlashVer(reqMajorVer, reqMinorVer, reqRevision)
-{
-	versionStr = GetSwfVer();
-	if (versionStr == -1 ) {
-		return false;
-	} else if (versionStr != 0) {
-		if(isIE && isWin && !isOpera) {
-			// Given "WIN 2,0,0,11"
-			tempArray         = versionStr.split(" "); 	// ["WIN", "2,0,0,11"]
-			tempString        = tempArray[1];			// "2,0,0,11"
-			versionArray      = tempString.split(",");	// ['2', '0', '0', '11']
-		} else {
-			versionArray      = versionStr.split(".");
-		}
-		var versionMajor      = versionArray[0];
-		var versionMinor      = versionArray[1];
-		var versionRevision   = versionArray[2];
-
-        	// is the major.revision >= requested major.revision AND the minor version >= requested minor
-		if (versionMajor > parseFloat(reqMajorVer)) {
-			return true;
-		} else if (versionMajor == parseFloat(reqMajorVer)) {
-			if (versionMinor > parseFloat(reqMinorVer))
-				return true;
-			else if (versionMinor == parseFloat(reqMinorVer)) {
-				if (versionRevision >= parseFloat(reqRevision))
-					return true;
-			}
-		}
-		return false;
-	}
-}
-
-function AC_AddExtension(src, ext)
-{
-  if (src.indexOf('?') != -1)
-    return src.replace(/\?/, ext+'?'); 
-  else
-    return src + ext;
-}
-
-function AC_Generateobj(objAttrs, params, embedAttrs) 
-{ 
-    var str = '';
-    if (isIE && isWin && !isOpera)
-    {
-  		str += '<object ';
-  		for (var i in objAttrs)
-  			str += i + '="' + objAttrs[i] + '" ';
-  		for (var i in params)
-  			str += '><param name="' + i + '" value="' + params[i] + '" /> ';
-  		str += '></object>';
-    } else {
-  		str += '<embed ';
-  		for (var i in embedAttrs)
-  			str += i + '="' + embedAttrs[i] + '" ';
-  		str += '> </embed>';
-    }
-
-    document.write(str);
-}
-
-function AC_FL_RunContent(){
-  var ret = 
-    AC_GetArgs
-    (  arguments, ".swf", "movie", "clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"
-     , "application/x-shockwave-flash"
-    );
-  AC_Generateobj(ret.objAttrs, ret.params, ret.embedAttrs);
-}
-
-function AC_GetArgs(args, ext, srcParamName, classid, mimeType){
-  var ret = new Object();
-  ret.embedAttrs = new Object();
-  ret.params = new Object();
-  ret.objAttrs = new Object();
-  for (var i=0; i < args.length; i=i+2){
-    var currArg = args[i].toLowerCase();    
-
-    switch (currArg){	
-      case "classid":
-        break;
-      case "pluginspage":
-        ret.embedAttrs[args[i]] = args[i+1];
-        break;
-      case "src":
-      case "movie":	
-        args[i+1] = AC_AddExtension(args[i+1], ext);
-        ret.embedAttrs["src"] = args[i+1];
-        ret.params[srcParamName] = args[i+1];
-        break;
-      case "onafterupdate":
-      case "onbeforeupdate":
-      case "onblur":
-      case "oncellchange":
-      case "onclick":
-      case "ondblClick":
-      case "ondrag":
-      case "ondragend":
-      case "ondragenter":
-      case "ondragleave":
-      case "ondragover":
-      case "ondrop":
-      case "onfinish":
-      case "onfocus":
-      case "onhelp":
-      case "onmousedown":
-      case "onmouseup":
-      case "onmouseover":
-      case "onmousemove":
-      case "onmouseout":
-      case "onkeypress":
-      case "onkeydown":
-      case "onkeyup":
-      case "onload":
-      case "onlosecapture":
-      case "onpropertychange":
-      case "onreadystatechange":
-      case "onrowsdelete":
-      case "onrowenter":
-      case "onrowexit":
-      case "onrowsinserted":
-      case "onstart":
-      case "onscroll":
-      case "onbeforeeditfocus":
-      case "onactivate":
-      case "onbeforedeactivate":
-      case "ondeactivate":
-      case "type":
-      case "codebase":
-        ret.objAttrs[args[i]] = args[i+1];
-        break;
-      case "id":
-      case "width":
-      case "height":
-      case "align":
-      case "vspace": 
-      case "hspace":
-      case "class":
-      case "title":
-      case "accesskey":
-      case "name":
-      case "tabindex":
-        ret.embedAttrs[args[i]] = ret.objAttrs[args[i]] = args[i+1];
-        break;
-      default:
-        ret.embedAttrs[args[i]] = ret.params[args[i]] = args[i+1];
-    }
-  }
-  ret.objAttrs["classid"] = classid;
-  if (mimeType) ret.embedAttrs["type"] = mimeType;
-  return ret;
-}
-
-
diff --git a/grade/report/visual/flare_visualization/flare/flare.demos/bin/deeplinking/deeplinking.css b/grade/report/visual/flare_visualization/flare/flare.demos/bin/deeplinking/deeplinking.css
deleted file mode 100644
index 5275b55216..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.demos/bin/deeplinking/deeplinking.css
+++ /dev/null
@@ -1,6 +0,0 @@
-/* This CSS stylesheet defines styles used by required elements in a DeepLinking application page */
-
-#ie_historyFrame { width: 0px; height: 0px; display:none }
-#firefox_anchorDiv { width: 0px; height: 0px; display:none }
-#safari_formDiv { width: 0px; height: 0px; display:none }
-#safari_rememberDiv { width: 0px; height: 0px; display:none }
diff --git a/grade/report/visual/flare_visualization/flare/flare.demos/bin/deeplinking/deeplinking.js b/grade/report/visual/flare_visualization/flare/flare.demos/bin/deeplinking/deeplinking.js
deleted file mode 100644
index 87a32b42fd..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.demos/bin/deeplinking/deeplinking.js
+++ /dev/null
@@ -1,517 +0,0 @@
-DeepLinkingUtils = {
-	addEvent: function(elm, evType, fn, useCapture) {
-		useCapture = useCapture || false;
-		if (elm.addEventListener) {
-			elm.addEventListener(evType, fn, useCapture);
-			return true;
-		}
-		else if (elm.attachEvent) {
-			var r = elm.attachEvent('on' + evType, fn);
-			return r;
-		}
-		else {
-			elm['on' + evType] = fn;
-		}
-	}
-}
-
-DeepLinking = (function() {
-	// type of browser
-    var browser = {
-        ie: false, 
-        firefox: false, 
-        safari: false, 
-        opera: false, 
-        version: -1
-    };
-
-    // Default app state URL to use when no fragment ID present
-    var defaultHash = '';
-
-    // Last-known app state URL
-    var currentHref = document.location.href;
-
-    // Initial URL (used only by IE)
-    var initialHref = document.location.href;
-
-    // Initial URL (used only by IE)
-    var initialHash = document.location.hash;
-
-    // History frame source URL prefix (used only by IE)
-    var historyFrameSourcePrefix = 'deeplinking/historyFrame.html?';
-
-    // History maintenance (used only by Safari)
-    var currentHistoryLength = -1;
-
-    var historyHash = [];
-
-    var initialState = createState(initialHref, initialHref + '#' + initialHash, initialHash);
-
-    var backStack = [];
-    var forwardStack = [];
-
-	//UserAgent detection
-    var useragent = navigator.userAgent.toLowerCase();
-
-    if (useragent.indexOf("opera") != -1) {
-        browser.opera = true;
-    } else if (useragent.indexOf("msie") != -1) {
-        browser.ie = true;
-        browser.version = parseFloat(useragent.substring(useragent.indexOf('msie') + 4));
-    } else if (useragent.indexOf("safari") != -1) {
-        browser.safari = true;
-        browser.version = parseFloat(useragent.substring(useragent.indexOf('safari') + 7));
-    } else if (useragent.indexOf("gecko") != -1) {
-        browser.firefox = true;
-    }
-
-    // Accessor functions for obtaining specific elements of the page.
-    function getHistoryFrame()
-    {
-        return document.getElementById('ie_historyFrame');
-    }
-
-    function getAnchorElement()
-    {
-        return document.getElementById('firefox_anchorDiv');
-    }
-
-    function getFormElement()
-    {
-        return document.getElementById('safari_formDiv');
-    }
-
-	function getRememberElement()
-	{
-		return document.getElementById("safari_remember_field");
-	}
-
-    /* Get the Flash player object for performing ExternalInterface callbacks. */
-    function getPlayer() {
-        var player = null; /* AJH, needed?  = document.getElementById(getPlayerId()); */
-        
-        if (player == null) {
-            player = document.getElementsByTagName('object')[0];
-        }
-        
-        if (player == null || player.object == null) {
-            player = document.getElementsByTagName('embed')[0];
-        }
-
-        return player;
-    }
-
-    /* Get the current location hash excluding the '#' symbol. */
-    function getHash() {
-       // It would be nice if we could use document.location.hash here,
-       // but it's faulty sometimes.
-       var idx = document.location.href.indexOf('#');
-       return (idx >= 0) ? document.location.href.substr(idx+1) : '';
-    }
-
-    /* Get the current location hash excluding the '#' symbol. */
-    function setHash(hash) {
-       // It would be nice if we could use document.location.hash here,
-       // but it's faulty sometimes.
-       if (hash == '') hash = '#'
-       document.location.hash = hash;
-    }
-
-    function createState(baseUrl, newUrl, flexAppUrl) {
-        return { 'baseUrl': baseUrl, 'newUrl': newUrl, 'flexAppUrl': flexAppUrl, 'title': null };
-    }
-
-    /* Add a history entry to the browser.
-     *   baseUrl: the portion of the location prior to the '#'
-     *   newUrl: the entire new URL, including '#' and following fragment
-     *   flexAppUrl: the portion of the location following the '#' only
-     */
-    function addHistoryEntry(baseUrl, newUrl, flexAppUrl, copyToAddressBar) {
-
-        //delete all the history entries
-        forwardStack = [];
-
-        if (browser.ie) {
-            //Check to see if we are being asked to do a navigate for the first
-            //history entry, and if so ignore, because it's coming from the creation
-            //of the history iframe
-            if (flexAppUrl == defaultHash && document.location.href == initialHref && _ie_firstload) {
-                currentHref = initialHref;
-                return;
-            }
-            if ((!flexAppUrl || flexAppUrl == defaultHash) && _ie_firstload) {
-                newUrl = baseUrl + '#' + defaultHash;
-                flexAppUrl = defaultHash;
-            } else {
-                // for IE, tell the history frame to go somewhere without a '#'
-                // in order to get this entry into the browser history.
-                getHistoryFrame().src = historyFrameSourcePrefix + flexAppUrl;
-            }
-            if (copyToAddressBar) {
-                setHash(flexAppUrl);
-                //document.location.href = newUrl;
-            }
-        } else {
-
-            //ADR
-            if (backStack.length == 0 && initialState.flexAppUrl == flexAppUrl) {
-                initialState = createState(baseUrl, newUrl, flexAppUrl);
-            } else if(backStack.length > 0 && backStack[backStack.length - 1].flexAppUrl == flexAppUrl) {
-                backStack[backStack.length - 1] = createState(baseUrl, newUrl, flexAppUrl);
-            }
-
-            if (browser.safari) {
-                // for Safari, submit a form whose action points to the desired URL
-                if (browser.version <= 419.3) {
-                    var file = window.location.pathname.toString();
-                    file = file.substring(file.lastIndexOf("/")+1);
-                    getFormElement().innerHTML = '<form name="historyForm" action="'+file+'#' + flexAppUrl + '" method="GET"></form>';
-                    //get the current elements and add them to the form
-                    var qs = window.location.search.substring(1);
-                    var qs_arr = qs.split("&");
-                    for (var i = 0; i < qs_arr.length; i++) {
-                        var tmp = qs_arr[i].split("=");
-                        var elem = document.createElement("input");
-                        elem.type = "hidden";
-                        elem.name = tmp[0];
-                        elem.value = tmp[1];
-                        document.forms.historyForm.appendChild(elem);
-                    }
-                    document.forms.historyForm.submit();
-                } else {
-                    top.location.hash = flexAppUrl;
-                }
-                // We also have to maintain the history by hand for Safari
-                historyHash[history.length] = flexAppUrl;
-                _storeStates();
-            } else {
-                // Otherwise, write an anchor into the page and tell the browser to go there
-                addAnchor(flexAppUrl);
-                if (copyToAddressBar) {
-                    setHash(flexAppUrl);
-                }
-           }
-        }
-        backStack.push(createState(baseUrl, newUrl, flexAppUrl));
-    }
-
-    function _storeStates() {
-        if (browser.safari) {
-            getRememberElement().value = historyHash.join(",");
-        }
-    }
-
-    function handleBackButton() {
-        //The "current" page is always at the top of the history stack.
-        var current = backStack.pop();
-        if (!current) { return; }
-        var last = backStack[backStack.length - 1];
-        if (!last && backStack.length == 0){
-            last = initialState;
-        }
-        forwardStack.push(current);
-    }
-
-    function handleForwardButton() {
-        //summary: private method. Do not call this directly.
-
-        var last = forwardStack.pop();
-        if (!last) { return; }
-        backStack.push(last);
-    }
-
-    function handleArbitraryUrl() {
-        //delete all the history entries
-        forwardStack = [];
-    }
-
-    /* Called periodically to poll to see if we need to detect navigation that has occurred */
-    function checkForUrlChange() {
-
-        if (browser.ie) {
-            if (currentHref != document.location.href && currentHref + '#' != document.location.href) {
-                //This occurs when the user has navigated to a specific URL
-                //within the app, and didn't use browser back/forward
-                //IE seems to have a bug where it stops updating the URL it
-                //shows the end-user at this point, but programatically it
-                //appears to be correct.  Do a full app reload to get around
-                //this issue.
-                if (browser.version < 7) {
-                    currentHref = document.location.href;
-                    document.location.reload();
-                } else {
-                    //getHistoryFrame().src = historyFrameSourcePrefix + getHash();
-                }
-            }
-		}
-
-		if (browser.safari) {
-            // For Safari, we have to check to see if history.length changed.
-            if (currentHistoryLength >= 0 && history.length != currentHistoryLength) {
-				//alert("did change: " + history.length + ", " + historyHash.length + "|" + historyHash[history.length] + "|>" + historyHash.join("|"));
-                // If it did change, then we have to look the old state up
-                // in our hand-maintained array since document.location.hash
-                // won't have changed, then call back into BrowserManager.
-                currentHistoryLength = history.length;
-                var flexAppUrl = historyHash[currentHistoryLength];
-                if (flexAppUrl == '') {
-                    //flexAppUrl = defaultHash;
-                }
-                getPlayer().browserURLChange(flexAppUrl);
-                _storeStates();
-            }
-		}
-		if (browser.firefox) {
-            if (currentHref != document.location.href) {
-                var bsl = backStack.length;
-
-                var urlActions = {
-                    back: false, 
-                    forward: false, 
-                    set: false
-                }
-
-                if ((window.location.hash == initialHash || window.location.href == initialHref) && (bsl == 1)) {
-                    urlActions.back = true;
-                    // FIXME: could this ever be a forward button?
-                    // we can't clear it because we still need to check for forwards. Ugg.
-                    // clearInterval(this.locationTimer);
-                    handleBackButton();
-                }
-                
-                // first check to see if we could have gone forward. We always halt on
-                // a no-hash item.
-                if (forwardStack.length > 0) {
-                    if (forwardStack[forwardStack.length-1].flexAppUrl == getHash()) {
-                        urlActions.forward = true;
-                        handleForwardButton();
-                    }
-                }
-
-                // ok, that didn't work, try someplace back in the history stack
-                if ((bsl >= 2) && (backStack[bsl - 2])) {
-                    if (backStack[bsl - 2].flexAppUrl == getHash()) {
-                        urlActions.back = true;
-                        handleBackButton();
-                    }
-                }
-                
-                if (!urlActions.back && !urlActions.forward) {
-                    var foundInStacks = {
-                        back: -1, 
-                        forward: -1
-                    }
-
-                    for (var i = 0; i < backStack.length; i++) {
-                        if (backStack[i].flexAppUrl == getHash() && i != (bsl - 2)) {
-                            arbitraryUrl = true;
-                            foundInStacks.back = i;
-                        }
-                    }
-                    for (var i = 0; i < forwardStack.length; i++) {
-                        if (forwardStack[i].flexAppUrl == getHash() && i != (bsl - 2)) {
-                            arbitraryUrl = true;
-                            foundInStacks.forward = i;
-                        }
-                    }
-                    handleArbitraryUrl();
-                }
-
-                // Firefox changed; do a callback into BrowserManager to tell it.
-                currentHref = document.location.href;
-                var flexAppUrl = getHash();
-                if (flexAppUrl == '') {
-                    //flexAppUrl = defaultHash;
-                }
-                getPlayer().browserURLChange(flexAppUrl);
-            }
-        }
-        //setTimeout(checkForUrlChange, 50);
-    }
-
-    /* Write an anchor into the page to legitimize it as a URL for Firefox et al. */
-    function addAnchor(flexAppUrl)
-    {
-       if (document.getElementsByName(flexAppUrl).length == 0) {
-           getAnchorElement().innerHTML += "<a name='" + flexAppUrl + "'>" + flexAppUrl + "</a>";
-       }
-    }
-
-    var _initialize = function () {
-		if (browser.ie)
-		{
-            var scripts = document.getElementsByTagName('script');
-            for (var i = 0, s; s = scripts[i]; i++) {
-                if (s.src.indexOf("deeplinking.js") > -1) {
-                    var iframe_location = (new String(s.src)).replace("deeplinking.js", "historyFrame.html");
-                }
-            }
-			historyFrameSourcePrefix = iframe_location + "?";
-			var src = historyFrameSourcePrefix;
-
-            var iframe = document.createElement("iframe");
-            iframe.id = 'ie_historyFrame';
-            iframe.name = 'ie_historyFrame';
-            //iframe.src = historyFrameSourcePrefix;
-            document.body.appendChild(iframe);
-		}
-
-		if (browser.safari)
-		{
-			var rememberDiv = document.createElement("div");
-			rememberDiv.id = 'asafari_rememberDiv';
-			document.body.appendChild(rememberDiv);
-			rememberDiv.innerHTML = '<input type="text" id="safari_remember_field" style="width: 500px;">';
-
-			var formDiv = document.createElement("div");
-			formDiv.id = 'safari_formDiv';
-			document.body.appendChild(formDiv);
-
-            var reloader_content = document.createElement('div');
-            reloader_content.id = 'safarireloader';
-            var scripts = document.getElementsByTagName('script');
-            for (var i = 0, s; s = scripts[i]; i++) {
-                if (s.src.indexOf("deeplinking.js") > -1) {
-                    html = (new String(s.src)).replace(".js", ".html");
-                }
-            }
-            reloader_content.innerHTML = '<iframe id="safarireloader-iframe" src="about:blank" frameborder="no" scrolling="no"></iframe>';
-            document.body.appendChild(reloader_content);
-            reloader_content.style.position = 'absolute';
-            reloader_content.style.left = reloader_content.style.top = '-9999px';
-            iframe = reloader_content.getElementsByTagName('iframe')[0];
-
-			if (document.getElementById("safari_remember_field").value != "" ) {
-				historyHash = document.getElementById("safari_remember_field").value.split(",");
-			}
-
-		}
-
-		if (browser.firefox)
-		{
-			var anchorDiv = document.createElement("div");
-			anchorDiv.id = 'firefox_anchorDiv';
-			document.body.appendChild(anchorDiv);
-		}
-        
-        //setTimeout(checkForUrlChange, 50);
-    }
-
-    return {
-		historyHash: historyHash, 
-        backStack: function() { return backStack; }, 
-        forwardStack: function() { return forwardStack }, 
-        getPlayer: getPlayer, 
-        initialize: function(src) {
-            _initialize(src);
-        }, 
-        setURL: function(url) {
-            document.location.href = url;
-        }, 
-        getURL: function() {
-            return document.location.href;
-        }, 
-        getTitle: function() {
-            return document.title;
-        }, 
-        setTitle: function(title) {
-            try {
-                backStack[backStack.length - 1].title = title;
-            } catch(e) { }
-            
-            document.title = title;
-        }, 
-        setDefaultURL: function(def)
-        {
-            defaultHash = def;
-            def = getHash();
-            //trailing ? is important else an extra frame gets added to the history
-            //when navigating back to the first page.  Alternatively could check
-            //in history frame navigation to compare # and ?.
-			if (browser.ie)
-			{
-                _ie_firstload = true;
-                getHistoryFrame().src = historyFrameSourcePrefix + def;
-                window.location.replace("#" + def);
-                setInterval(checkForUrlChange, 50);
-			}
-
-			if (browser.safari)
-			{
-                currentHistoryLength = history.length;
-                if (historyHash.length == 0) {
-                    historyHash[currentHistoryLength] = defaultHash;
-                    var newloc = "#" + def;
-                    window.location.replace(newloc);
-                } else {
-                    //alert(historyHash[historyHash.length-1]);
-                }
-                //setHash(def);
-                setInterval(checkForUrlChange, 50);
-			}
-			
-			
-			if (browser.firefox || browser.opera)
-			{
-                var reg = new RegExp("#" + def + "$");
-                if (window.location.toString().match(reg)) {
-                } else {
-                    var newloc ="#" + def;
-                    window.location.replace(newloc);
-                }
-                setInterval(checkForUrlChange, 50);
-                //setHash(def);
-            }
-        }, 
-
-        /* Set the current browser URL; called from inside BrowserManager to propagate
-         * the application state out to the container.
-         */
-        setBrowserURL: function(flexAppUrl, copyToAddressBar) {
-           //fromIframe = fromIframe || false;
-           //fromFlex = fromFlex || false;
-           //alert("setBrowserURL: " + flexAppUrl);
-           //flexAppUrl = (flexAppUrl == "") ? defaultHash : flexAppUrl ;
-
-           var pos = document.location.href.indexOf('#');
-           var baseUrl = pos != -1 ? document.location.href.substr(0, pos) : document.location.href;
-           var newUrl = baseUrl + '#' + flexAppUrl;
-
-           if (document.location.href != newUrl && document.location.href + '#' != newUrl) {
-               currentHref = newUrl;
-               addHistoryEntry(baseUrl, newUrl, flexAppUrl, copyToAddressBar);
-               currentHistoryLength = history.length;
-           }
-
-           return false;
-        } 
-
-    }
-
-})();
-
-// Initialization
-
-// Automated unit testing and other diagnostics
-
-function setURL(url)
-{
-    document.location.href = url;
-}
-
-function backButton()
-{
-    history.back();
-}
-
-function forwardButton()
-{
-    history.forward();
-}
-
-function goForwardOrBackInHistory(step)
-{
-    history.go(step);
-}
-
-DeepLinkingUtils.addEvent(window, "load", function() { DeepLinking.initialize(); });
diff --git a/grade/report/visual/flare_visualization/flare/flare.demos/bin/deeplinking/historyFrame.html b/grade/report/visual/flare_visualization/flare/flare.demos/bin/deeplinking/historyFrame.html
deleted file mode 100644
index 55788e05d8..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.demos/bin/deeplinking/historyFrame.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<html>
-    <head>
-        <META HTTP-EQUIV="Pragma" CONTENT="no-cache"> 
-        <META HTTP-EQUIV="Expires" CONTENT="-1"> 
-    </head>
-    <body>
-    <script>
-        function processUrl()
-        {
-
-            var pos = url.indexOf("?");
-            url = pos != -1 ? url.substr(pos + 1) : "";
-            if (!parent._ie_firstload) {
-                parent.DeepLinking.setBrowserURL(url, true);
-                try {
-                    parent.DeepLinking.getPlayer().browserURLChange(url);
-                } catch(e) { }
-            } else {
-                parent._ie_firstload = false;
-            }
-        }
-
-        var url = document.location.href;
-        processUrl();
-        document.write(url);
-    </script>
-    Yo, I'm your history.
-    </body>
-</html>
diff --git a/grade/report/visual/flare_visualization/flare/flare.demos/bin/demos.html b/grade/report/visual/flare_visualization/flare/flare.demos/bin/demos.html
deleted file mode 100644
index 7d96ac84a8..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.demos/bin/demos.html
+++ /dev/null
@@ -1,118 +0,0 @@
-<!-- saved from url=(0014)about:internet -->
-<html lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-
-<!--  BEGIN DeepLinking required section -->
-<link rel="stylesheet" type="text/css" href="deeplinking/deeplinking.css" />
-<!--  END DeepLinking required section -->
-
-<title></title>
-<script src="AC_OETags.js" language="javascript"></script>
-
-<!--  BEGIN DeepLinking required section -->
-<script src="deeplinking/deeplinking.js" language="javascript"></script>
-<!--  END DeepLinking required section -->
-
-<style>
-body { margin: 0px; overflow:hidden }
-</style>
-<script language="JavaScript" type="text/javascript">
-<!--
-// -----------------------------------------------------------------------------
-// Globals
-// Major version of Flash required
-var requiredMajorVersion = 9;
-// Minor version of Flash required
-var requiredMinorVersion = 0;
-// Minor version of Flash required
-var requiredRevision = 28;
-// -----------------------------------------------------------------------------
-// -->
-</script>
-</head>
-
-<body scroll="no">
-<center>
-<div style="border: 1px solid #cccccc; width:800; height:550; margin-top:20px;">
-<script language="JavaScript" type="text/javascript">
-<!--
-// Version check for the Flash Player that has the ability to start Player Product Install (6.0r65)
-var hasProductInstall = DetectFlashVer(6, 0, 65);
-
-// Version check based upon the values defined in globals
-var hasRequestedVersion = DetectFlashVer(requiredMajorVersion, requiredMinorVersion, requiredRevision);
-
-
-// Check to see if a player with Flash Product Install is available and the version does not meet the requirements for playback
-if ( hasProductInstall && !hasRequestedVersion ) {
-	// MMdoctitle is the stored document.title value used by the installation process to close the window that started the process
-	// This is necessary in order to close browser windows that are still utilizing the older version of the player after installation has completed
-	// DO NOT MODIFY THE FOLLOWING FOUR LINES
-	// Location visited after installation is complete if installation is required
-	var MMPlayerType = (isIE == true) ? "ActiveX" : "PlugIn";
-	var MMredirectURL = window.location;
-    document.title = document.title.slice(0, 47) + " - Flash Player Installation";
-    var MMdoctitle = document.title;
-
-	AC_FL_RunContent(
-		"src", "playerProductInstall",
-		"FlashVars", "MMredirectURL="+MMredirectURL+'&MMplayerType='+MMPlayerType+'&MMdoctitle='+MMdoctitle+"",
-		"width", "800",
-		"height", "550",
-		"align", "middle",
-		"id", "demos",
-		"quality", "high",
-		"bgcolor", "#ffffff",
-		"name", "demos",
-		"allowScriptAccess","sameDomain",
-		"type", "application/x-shockwave-flash",
-		"pluginspage", "http://www.adobe.com/go/getflashplayer"
-	);
-} else if (hasRequestedVersion) {
-	// if we've detected an acceptable version
-	// embed the Flash Content SWF when all tests are passed
-	AC_FL_RunContent(
-			"src", "demos",
-			"width", "800",
-			"height", "550",
-			"align", "middle",
-			"id", "demos",
-			"quality", "high",
-			"bgcolor", "#ffffff",
-			"name", "demos",
-			"allowScriptAccess","sameDomain",
-			"type", "application/x-shockwave-flash",
-			"pluginspage", "http://www.adobe.com/go/getflashplayer"
-	);
-  } else {  // flash is too old or we can't detect the plugin
-    var alternateContent = 'Alternate HTML content should be placed here. '
-  	+ 'This content requires the Adobe Flash Player. '
-   	+ '<a href=http://www.adobe.com/go/getflash/>Get Flash</a>';
-    document.write(alternateContent);  // insert non-flash content
-  }
-// -->
-</script>
-<noscript>
-  	<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
-			id="demos" width="800" height="550"
-			codebase="http://fpdownload.macromedia.com/get/flashplayer/current/swflash.cab">
-			<param name="movie" value="demos.swf" />
-			<param name="quality" value="high" />
-			<param name="bgcolor" value="#ffffff" />
-			<param name="allowScriptAccess" value="sameDomain" />
-			<embed src="demos.swf" quality="high" bgcolor="#ffffff"
-				width="800" height="550" name="demos" align="middle"
-				play="true"
-				loop="false"
-				quality="high"
-				allowScriptAccess="sameDomain"
-				type="application/x-shockwave-flash"
-				pluginspage="http://www.adobe.com/go/getflashplayer">
-			</embed>
-	</object>
-</noscript>
-</div>
-</center>
-</body>
-</html>
diff --git a/grade/report/visual/flare_visualization/flare/flare.demos/bin/demos.swf b/grade/report/visual/flare_visualization/flare/flare.demos/bin/demos.swf
deleted file mode 100644
index 8218606272..0000000000
Binary files a/grade/report/visual/flare_visualization/flare/flare.demos/bin/demos.swf and /dev/null differ
diff --git a/grade/report/visual/flare_visualization/flare/flare.demos/bin/playerProductInstall.swf b/grade/report/visual/flare_visualization/flare/flare.demos/bin/playerProductInstall.swf
deleted file mode 100644
index bdc3437856..0000000000
Binary files a/grade/report/visual/flare_visualization/flare/flare.demos/bin/playerProductInstall.swf and /dev/null differ
diff --git a/grade/report/visual/flare_visualization/flare/flare.demos/demos.as b/grade/report/visual/flare_visualization/flare/flare.demos/demos.as
deleted file mode 100644
index 0dded71ae0..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.demos/demos.as
+++ /dev/null
@@ -1,134 +0,0 @@
-package {
-	import flare.animate.Transitioner;
-	import flare.demos.Animation;
-	import flare.demos.Bars;
-	import flare.demos.Chart;
-	import flare.demos.Distortion;
-	import flare.demos.GraphView;
-	import flare.demos.Pie;
-	import flare.demos.Smoke;
-	import flare.demos.Stacks;
-	import flare.demos.Timeline;
-	import flare.demos.TreeMap;
-	import flare.util.Button;
-	
-	import flash.display.DisplayObject;
-	import flash.display.Sprite;
-	import flash.events.MouseEvent;
-
-	[SWF(width="800", height="550", backgroundColor="#ffffff", frameRate="30")]
-	public class demos extends Sprite
-	{
-		private var _demos:Array;
-		private var _cancel:Button;
-		private var _buttons:Sprite;
-		private var _demo:Sprite;
-		private var _logo:FlareLogo;
-		private var _cur:uint;
-		
-		public function demos()
-		{
-			// create logo
-			_logo = new FlareLogo();
-			_logo.x = stage.stageWidth / 2;
-			_logo.y = stage.stageHeight/2 - _logo.height / 2;
-			_logo.play();
-			addChild(_logo);
-				
-			// create demos
-			_demo = new Sprite();
-			addChild(_demo);
-			_buttons = createDemos();
-			_buttons.x = (stage.stageWidth - _buttons.width) / 2;
-			_buttons.y = stage.stageHeight - _buttons.height*3;
-			addChild(_buttons);
-			
-			// create cancel button
-			_cancel = new Button("Back");
-			_cancel.visible = false;
-			_cancel.x = stage.stageWidth - 10 - _cancel.width;
-			_cancel.y = stage.stageHeight - 10 - _cancel.height;
-			_cancel.addEventListener(MouseEvent.CLICK, cancel);
-			addChild(_cancel);
-		}
-		
-		private function createDemos():Sprite
-		{
-			_demos = new Array();
-			_demos.push(new Animation());
-			_demos.push(new Smoke());
-			_demos.push(new Distortion());
-			_demos.push(new GraphView());
-			_demos.push(new TreeMap());
-			_demos.push(new Stacks());
-			_demos.push(new Timeline());
-			_demos.push(new Chart());
-			_demos.push(new Bars());
-			_demos.push(new Pie());
-			
-			var s:Sprite = new Sprite();
-			var w:Number = 0;
-			
-			for (var i:uint=0; i<_demos.length; ++i) {
-				var b:Button = new Button(_demos[i].name);
-				b.addEventListener(MouseEvent.CLICK, showDemo);
-				b.x = w;
-				w += b.width + 4;
-				s.addChild(b);
-			}
-			return s;
-		}
-		
-		private function showDemo(event:MouseEvent):void
-		{
-			var tgt:DisplayObject = event.target as DisplayObject;
-			_cur = _buttons.getChildIndex(tgt);
-			_demo.alpha = 0;
-			_demo.addChild(_demos[_cur] as Sprite);
-			_cancel.alpha = 0;
-			_cancel.visible = true;
-			
-			var t:Transitioner = new Transitioner(1);
-			t.$(_buttons).alpha = 0;
-			t.$(_logo).alpha = 0;
-			t.onEnd = function():void {
-				_buttons.visible = false;
-			};
-			t.play();
-						
-			t = new Transitioner(1);
-			t.delay = 0.5;
-			t.onStart = function():void {
-				_demos[_cur].play();
-			}
-			t.$(_cancel).alpha = 1;
-			t.$(_demo).alpha = 1;
-			t.play();
-			_logo.pause();
-		}
-		
-		private function cancel(event:MouseEvent):void
-		{
-			_buttons.visible = true;
-			
-			var t:Transitioner = new Transitioner(1);
-			t.$(_demo).alpha = 0;
-			t.$(_cancel).alpha = 0;
-			t.onEnd = function():void {
-				_demos[_cur].stop();
-				_demo.removeChild(_demos[_cur] as Sprite);
-				_cur = 0;
-				_cancel.visible = false;
-			}
-			t.play();
-			
-			t = new Transitioner(1);
-			t.delay = 0.5;
-			t.$(_buttons).alpha = 1;
-			t.$(_logo).alpha = 1;
-			t.play();
-			_logo.play();
-		}
-		
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.demos/flare/demos/Animation.as b/grade/report/visual/flare_visualization/flare/flare.demos/flare/demos/Animation.as
deleted file mode 100644
index 72ddcb4c0e..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.demos/flare/demos/Animation.as
+++ /dev/null
@@ -1,93 +0,0 @@
- package flare.demos
-{
-	import flare.animate.Transitioner;
-	import flash.utils.Timer;
-	import flash.events.TimerEvent;
-	import flash.events.Event;
-	import flare.vis.data.DataSprite;
-	import flash.filters.GlowFilter;
-	import flash.filters.DropShadowFilter;
-	import flash.filters.BlurFilter;
-	import flash.geom.Rectangle;
-	import flare.vis.data.render.ShapeRenderer;
-	
-	public class Animation extends Demo
-	{
-		private var trans:Transitioner;
-		private var timer:Timer;
-		private var rev:Boolean = false;
-		
-		public function Animation() {
-			name = "Animation";
-			var N:uint = 9;
-			
-			var sr:ShapeRenderer = new ShapeRenderer();
-			sr.defaultSize = 15;
-			
-			for (var i:int=-N/2; i<N/2; ++i) {
-				var vi:DataSprite = new DataSprite();
-				vi.renderer = sr;
-				vi.x = 40*i;
-				vi.fillColor = 0x8888ff;
-				vi.fillAlpha = 0.8;
-				vi.render();
-				vi.mouseEnabled = false;
-				addChild(vi);
-			}
-
-			getChildAt(0).filters = [new GlowFilter(0xff0000,1,10,10,2,5,false,false)];
-			getChildAt(1).filters = [new DropShadowFilter()];
-			getChildAt(2).filters = [new BlurFilter()];
-			getChildAt(6).filters = [new BlurFilter()];
-			getChildAt(7).filters = [new DropShadowFilter()];
-			getChildAt(8).filters = [new GlowFilter(0xff0000,1,10,10,2,5,false,false)];
-			
-			x = WIDTH/2;
-			y = HEIGHT/2;
-				
-			trans = new Transitioner(2.5);
-			trans.delay = 0.5;
-			var o:Object;
-			with (trans) {
-				// the $() function returns an object for setting target values
-				o = trans.$(getChildAt(5)); o.x = 0; o.y = 200;  o.alpha = 0;
-				o = trans.$(getChildAt(3)); o.x = 0; o.y = -200; o.alpha = 0;
-				o = trans.$(getChildAt(7)); o.x = 0; o.y = -200; o.alpha = 0;
-				o = trans.$(getChildAt(1)); o.x = 0; o.y = 200;  o.alpha = 0;
-				o = trans.$(getChildAt(8)); o.x = 0; o.y = 200;  o.alpha = 0;
-				o = trans.$(getChildAt(0)); o.x = 0; o.y = -200; o.alpha = 0;
-
-				$(getChildAt(2)).fillColor = 0xffCC3355;
-				$(getChildAt(6)).fillColor = 0xffCC3355;
-				$(getChildAt(5)).scaleX = 20;
-				$(getChildAt(5)).scaleY = 20;
-				$(getChildAt(3)).scaleX = 20;
-				$(getChildAt(3)).scaleY = 20;
-				
-				// how are they related?  _(obj).values == $(obj)
-				// (unless the transitioner is in immediate mode. see docs for more!)
-			}
-		}
-		
-		public override function play():void
-		{
-			var rev:Boolean = false;
-			trans.onEnd = function():void {
-				trans.play(rev = !rev);
-			}
-			trans.play();
-			this.addEventListener(Event.ENTER_FRAME, onRotate);
-		}
-		
-		public override function stop():void
-		{
-			trans.onEnd = null;
-			trans.stop();
-			this.removeEventListener(Event.ENTER_FRAME, onRotate);
-		}
-
-		private function onRotate(event:Event) : void {
-			this.rotation += 1;			
-		}		
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.demos/flare/demos/Bars.as b/grade/report/visual/flare_visualization/flare/flare.demos/flare/demos/Bars.as
deleted file mode 100644
index b6de06fb01..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.demos/flare/demos/Bars.as
+++ /dev/null
@@ -1,72 +0,0 @@
-package flare.demos
-{
-	import flare.animate.Transitioner;
-	import flare.util.Button;
-	import flare.vis.Visualization;
-	import flare.vis.data.Data;
-	import flare.vis.data.DataSprite;
-	import flare.vis.operator.encoder.ColorEncoder;
-	import flare.vis.operator.layout.AxisLayout;
-	import flare.vis.scale.ScaleType;
-	import flare.vis.util.graphics.Shapes;
-	
-	import flash.events.MouseEvent;
-	
-	public class Bars extends Demo
-	{
-		public function Bars() {
-			name = "Bars";
-			
-			var vis:Visualization = new Visualization(getData(44,20));
-			vis.bounds.width = 700;
-			vis.bounds.height = HEIGHT - 100;
-			vis.data.nodes.setProperties({
-				shape: Shapes.HORIZONTAL_BAR,
-				lineAlpha: 0,
-				size: 1.5
-			});
-
-			vis.operators.add(new AxisLayout("data.x", "data.y", true, false));
-			vis.operators.add(new ColorEncoder("data.s", 1, "fillColor", ScaleType.CATEGORIES));
-			vis.xyAxes.yAxis.showLines = false;
-			vis.update();
-
-			addChild(vis);
-			
-			vis.x = 50; vis.y = 20;
-			
-			
-			// data update
-			var btn:Button = new Button("Update");
-			btn.addEventListener(MouseEvent.CLICK, function(evt:MouseEvent):void
-			{
-				updateData(vis.data);
-				vis.update(new Transitioner(2)).play();
-			});
-			btn.x = 10; btn.y = HEIGHT - 10 - btn.height;
-			addChild(btn);
-		}
-		
-		public static function getData(N:int, M:int):Data
-		{
-			var data:Data = new Data();
-			for (var i:uint=0; i<N; ++i) {
-				for (var j:uint=0; j<M; ++j) {
-					var s:String = String(i<10?"0"+i:i);
-					data.addNode({
-						y:s, s:j, x: int(1 + 10*Math.random())
-					});
-				}
-			}
-			return data;
-		}
-		
-		public static function updateData(data:Data):void
-		{
-			data.nodes.visit(function(d:DataSprite):void {
-				d.data.x = int(1 + 10*Math.random());
-			});
-		}
-		
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.demos/flare/demos/Chart.as b/grade/report/visual/flare_visualization/flare/flare.demos/flare/demos/Chart.as
deleted file mode 100644
index 56ec92ed3f..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.demos/flare/demos/Chart.as
+++ /dev/null
@@ -1,141 +0,0 @@
-package flare.demos
-{
-	import flare.animate.Transitioner;
-	import flare.util.Button;
-	import flare.util.Stats;
-	import flare.vis.Visualization;
-	import flare.vis.controls.HoverControl;
-	import flare.vis.controls.SelectionControl;
-	import flare.vis.data.Data;
-	import flare.vis.data.DataSprite;
-	import flare.vis.operator.distortion.BifocalDistortion;
-	import flare.vis.operator.encoder.ColorEncoder;
-	import flare.vis.operator.encoder.ShapeEncoder;
-	import flare.vis.operator.encoder.SizeEncoder;
-	import flare.vis.operator.layout.AxisLayout;
-	import flare.vis.palette.ColorPalette;
-	import flare.vis.scale.ScaleType;
-	import flare.vis.util.Filters;
-	
-	import flash.events.Event;
-	import flash.events.MouseEvent;
-	import flash.filters.GlowFilter;
-	import flash.geom.Point;
-	
-	public class Chart extends Demo
-	{
-		private var vis:Visualization;
-		private var distort:flare.vis.operator.distortion.Distortion;
-		
-		public function Chart() {
-			name = "Chart";
-			
-			vis = new Visualization(getData(100));
-			vis.bounds.width = WIDTH-65;
-			vis.bounds.height = HEIGHT-90;
-			addChild(vis);
-			
-			var field1:String = "data.value1";
-			var field2:String = "data.value2";
-			
-			vis.data.visit(function(d:DataSprite):void {
-				d.fillColor = 0x018888ff;
-				d.lineColor = 0xcc000088;
-				d.lineWidth = 3;
-			});
-			vis.operators.add(new AxisLayout(field1, field2));
-			vis.operators.add(new ShapeEncoder(field1));
-			vis.operators.add(new SizeEncoder(field2, Data.NODES, ScaleType.QUANTILE, 5));
-			vis.operators.add(new ColorEncoder(field1,Data.NODES, "lineColor", ScaleType.CATEGORIES));
-			vis.xyAxes.xAxis.fixLabelOverlap = false; // keep overlapping labels
-			vis.update();
-			
-			vis.x = 45;
-			vis.y = 15;
-			
-			// add mouse over
-			var hc:HoverControl = new HoverControl(vis, Filters.isDataSprite);
-			hc.onRollOver = function(d:DataSprite):void {
-				d.filters = [new GlowFilter(0xFFFF55, 0.8, 6, 6, 10)];
-			};
-			hc.onRollOut = function(d:DataSprite):void {
-				d.filters = null;
-			}
-			
-			var sc:SelectionControl = new SelectionControl(null, Filters.isDataSprite);
-			sc.onSelect = hc.onRollOver;
-			sc.onDeselect = hc.onRollOut;
-			vis.controls.add(sc);
-
-			// add scale update button
-			var bs:Button = new Button("Change Scale");
-			bs.addEventListener(MouseEvent.CLICK, function(evt:MouseEvent):void {
-				// change the x-axis scale and animate the result
-				var al:AxisLayout = vis.operators[0] as AxisLayout;
-				al.xScaleType = 
-					al.xScaleType==ScaleType.LOG ? ScaleType.LINEAR : ScaleType.LOG;
-				vis.update(new Transitioner(2)).play();
-			});
-			bs.x = 10; bs.y = HEIGHT - 10 - bs.height;
-			addChild(bs);
-			
-			// add scale distortion button
-			var bd:Button = new Button("Distortion");
-			bd.addEventListener(MouseEvent.CLICK, function(evt:MouseEvent):void {
-				if (distort != null) {
-					// remove distortion operator and frame listener
-					vis.operators.remove(distort);
-					distort = null;
-					removeEventListener(Event.ENTER_FRAME, mouseUpdate);
-					// animate back to non-distorted view
-					vis.update(new Transitioner(1)).play();
-				} else {
-					// add and initialize distortion operator 
-					vis.operators.add(distort=new BifocalDistortion());
-					distort.distortSize = false;
-					distort.layoutAnchor = new Point(vis.mouseX, vis.mouseY);
-					// animate into distorted view, add frame listener
-					var t:Transitioner = vis.update(new Transitioner(1));
-					t.onEnd = function():void {
-						addEventListener(Event.ENTER_FRAME, mouseUpdate);	
-					};
-					t.play();
-				}
-			});
-			bd.x = 10 + bs.x + bs.width; bd.y = HEIGHT - 10 - bd.height;
-			addChild(bd);
-		}
-		
-		private function mouseUpdate(evt:Event):void
-		{
-			// get current anchor, run update if changed
-			var p1:Point = distort.layoutAnchor;
-			distort.layoutAnchor = new Point(vis.mouseX, vis.mouseY);
-			// distortion might snap the anchor to the layout bounds
-			// so we need to re-retrieve the point to get an accurate point
-			var p2:Point = distort.layoutAnchor;
-			if (p1.x != p2.x || p1.y != p2.y) vis.update();
-		}
-		
-		public static function getData(n:int):Data
-		{
-			var data:Data = new Data();
-			var d:DataSprite;
-			var i:uint = 0;
-			
-			for (; i<10 && i<n; ++i) {
-				d = data.addNode({
-					value1: int(1 + 9*Math.random()),
-					value2: int(200*(Math.random()-0.5))
-				});
-			}
-			for (; i<n; ++i) {
-				d = data.addNode({
-					value1: int(1 + 99*Math.random()),
-					value2: int(200*(Math.random()-0.5))
-				});
-			}
-			return data;
-		}
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.demos/flare/demos/Demo.as b/grade/report/visual/flare_visualization/flare/flare.demos/flare/demos/Demo.as
deleted file mode 100644
index 2c8b677403..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.demos/flare/demos/Demo.as
+++ /dev/null
@@ -1,18 +0,0 @@
-package flare.demos
-{
-	import flash.display.Sprite;
-		
-	public class Demo extends Sprite
-	{
-		public var WIDTH:Number = 800;
-		public var HEIGHT:Number = 550;
-
-		public function play() : void
-		{
-		}
-		
-		public function stop() : void
-		{
-		}
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.demos/flare/demos/Distortion.as b/grade/report/visual/flare_visualization/flare/flare.demos/flare/demos/Distortion.as
deleted file mode 100644
index 5c7b36036d..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.demos/flare/demos/Distortion.as
+++ /dev/null
@@ -1,83 +0,0 @@
-package flare.demos
-{
-	import flare.util.Button;
-	import flare.util.GraphUtil;
-	import flare.vis.Visualization;
-	import flare.vis.controls.AnchorControl;
-	import flare.vis.operator.OperatorSwitch;
-	import flare.vis.operator.distortion.BifocalDistortion;
-	import flare.vis.operator.distortion.FisheyeDistortion;
-	import flare.vis.operator.encoder.PropertyEncoder;
-	import flare.vis.operator.layout.Layout;
-	import flare.vis.operator.layout.NodeLinkTreeLayout;
-	
-	import flash.display.DisplayObject;
-	import flash.display.Sprite;
-	import flash.events.Event;
-	import flash.events.MouseEvent;
-	import flash.geom.Point;
-	import flash.geom.Rectangle;
-	
-	public class Distortion extends Demo
-	{
-		private var vis:Visualization;
-		private var layout:Layout;
-		private var distort:Layout;
-		private var oswitch:OperatorSwitch;
-		
-		public function Distortion() {
-			name = "Distortion";
-			
-			// create visualization
-			addChild(vis = new Visualization(GraphUtil.diamondTree(4, 6, 6)));
-			vis.bounds = new Rectangle(0, 0, WIDTH, HEIGHT-40);
-			vis.operators.add(new PropertyEncoder({scaleX:1, scaleY:1}));
-			vis.operators.add(layout=new NodeLinkTreeLayout());
-			layout.layoutAnchor = new Point(20, vis.bounds.height/2);
-			oswitch = new OperatorSwitch(
-				new FisheyeDistortion(4,0,2),
-				new FisheyeDistortion(0,4,2),
-				new FisheyeDistortion(4,4,2),
-				new BifocalDistortion(0.1, 3.0, 0.1, 1.0),
-				new BifocalDistortion(0.1, 1.0, 0.1, 3.0),
-				new BifocalDistortion(0.1, 3.0, 0.1, 3.0)
-			);
-			vis.operators.add(oswitch);
-			setDistortion(0);
-			vis.update();
-			
-			// create buttons
-			var btnSprite:Sprite = new Sprite();
-			var btns:Array = ["Fisheye X","Fisheye Y","Fisheye XY",
-							  "Bifocal X","Bifocal Y","Bifocal XY"];
-			var w:Number = 0;
-			for (var i:uint=0; i<btns.length; ++i) {
-				var btn:Button = new Button(btns[i]);
-				btn.addEventListener(MouseEvent.CLICK, function(e:Event):void {
-					setDistortion(btnSprite.getChildIndex(e.target as DisplayObject));
-				});
-				btn.x = 10 + w;
-				w += 10 + btn.width;
-				btnSprite.addChild(btn);
-			}
-			btnSprite.y = HEIGHT - 10 - btnSprite.height;
-			addChild(btnSprite);
-		}
-		
-		private function setDistortion(idx:int):void
-		{
-			oswitch.index = idx;
-			distort = oswitch.getOperatorAt(idx) as Layout;
-			stop(); play();
-		}
-		
-		public override function play():void {
-			vis.controls.add(new AnchorControl(null, distort));
-		}
-		
-		public override function stop():void {
-			vis.controls.clear();
-		}
-
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.demos/flare/demos/Graph.as b/grade/report/visual/flare_visualization/flare/flare.demos/flare/demos/Graph.as
deleted file mode 100644
index eaebdbeb12..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.demos/flare/demos/Graph.as
+++ /dev/null
@@ -1,136 +0,0 @@
-package flare.demos
-{
-	import flash.events.Event;
-	import flash.events.MouseEvent;
-	import flare.physics.Simulation;
-	import flash.utils.Dictionary;
-	import flash.display.Sprite;
-	import flash.display.Shape;
-	import flare.physics.Particle;
-	import flare.physics.Spring;
-	import flare.animate.Scheduler;
-	import flare.animate.ISchedulable;
-	import flare.demos.Demo;
-	
-	public class Graph extends Demo implements ISchedulable
-	{
-		private var sim:Simulation;
-		private var nodes:Sprite;
-		private var edges:Sprite;
-		private var dragc:DragControl;
-		private var dict:Dictionary;
-		
-		public function Graph() {
-			name = "Graph";
-			edges = new Sprite(); addChild(edges);
-			nodes = new Sprite(); addChild(nodes);
-
-			sim = new Simulation(0, 0, 0.05, -50);
-			dict = new Dictionary();
-			
-			buildGrid(10, 10);
-			
-			dragc = new DragControl();
-			dragc.attach(nodes);
-			
-			new PanZoomControl().attach(this);
-			
-			drawGraph();
-			x = 0.5 * (WIDTH  - nodes.width);
-			y = 0.5 * (HEIGHT - nodes.height);
-		}
-		
-		private function newNode():Sprite {
-			var n:Sprite = new Sprite();
-			n.graphics.beginFill(0xaaaaaa, 0.5);
-			n.graphics.drawEllipse(-8,-8,16,16);
-			n.graphics.endFill();
-			n.buttonMode = true;
-			return n;
-		}
-		
-		private function buildGrid(rows:uint, cols:uint):void {
-			var n:Sprite, e:Shape;
-				
-			// init graph
-			for (var i:uint = 0; i<rows*cols; ++i) {
-				n = newNode();
-				nodes.addChild(n);
-				dict[n] = sim.addParticle(1, 30*(i%cols), 30*int(i/cols));
-			}
-			for (i = 0; i<rows*cols; ++i) {
-				if (i >= cols) {
-					e = new Shape();
-					edges.addChild(e);
-					dict[e] = sim.addSpring(sim.particles[i], sim.particles[i-cols], 30, 0.1, 0.1);
-				}
-				if (i % cols != 0) {
-					e = new Shape();
-					edges.addChild(e);
-					dict[e] = sim.addSpring(sim.particles[i], sim.particles[i-1], 30, 0.1, 0.1);
-				}
-			}
-		}
-		
-		private function drawGraph():void {
-			var p:Particle, s:Spring, n:Sprite, e:Shape;
-
-			for (var i:uint = 0; i<sim.particles.length; ++i) {
-				p = sim.particles[i] as Particle;
-				n = nodes.getChildAt(i) as Sprite;
-				if (n==dragc.activeItem) {
-					p.fixed = true;
-					p.x = n.x;
-					p.y = n.y;
-				} else {
-					p.fixed = false;
-				}
-			}
-
-			sim.tick();
-			for (i=0; i<sim.particles.length; ++i) {
-				p = sim.particles[i] as Particle;
-				if (!p.fixed) {
-					n = nodes.getChildAt(i) as Sprite;
-					n.x = p.x;
-					n.y = p.y;
-				}
-			}
-			for (i=0; i<sim.springs.length; ++i) {
-				s = sim.springs[i] as Spring;
-				e = edges.getChildAt(i) as Shape;
-				e.graphics.clear();
-				e.graphics.lineStyle(1, 0xdddddd, 0.8);
-				e.graphics.moveTo(s.p1.x, s.p1.y);
-				e.graphics.lineTo(s.p2.x, s.p2.y);
-			}
-		}
-		
-		private function onNodeDown(event:MouseEvent):void {
-			(dict[event.target] as Particle).fixed = true;
-			Sprite(event.target).startDrag();
-		}
-			
-		private function onNodeUp(event:MouseEvent):void {
-			(dict[event.target] as Particle).fixed = false;
-			Sprite(event.target).stopDrag();
-		}
-		
-		public function evaluate(t:Number):Boolean
-		{
-			drawGraph();
-			return false;
-		}
-		
-		override public function play():void
-		{
-			Scheduler.instance.add(this);
-		}
-		
-		override public function stop():void
-		{
-			Scheduler.instance.remove(this);
-		}
-		
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.demos/flare/demos/GraphView.as b/grade/report/visual/flare_visualization/flare/flare.demos/flare/demos/GraphView.as
deleted file mode 100644
index fdc2b7693b..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.demos/flare/demos/GraphView.as
+++ /dev/null
@@ -1,166 +0,0 @@
-package flare.demos
-{
-	import flare.animate.Sequence;
-	import flare.animate.Transition;
-	import flare.animate.Transitioner;
-	import flare.util.Button;
-	import flare.util.GraphUtil;
-	import flare.vis.Visualization;
-	import flare.vis.controls.DragControl;
-	import flare.vis.data.Data;
-	import flare.vis.data.NodeSprite;
-	import flare.vis.operator.OperatorSwitch;
-	import flare.vis.operator.layout.CircleLayout;
-	import flare.vis.operator.layout.ForceDirectedLayout;
-	import flare.vis.operator.layout.IndentedTreeLayout;
-	import flare.vis.operator.layout.NodeLinkTreeLayout;
-	import flare.vis.operator.layout.Orientation;
-	import flare.vis.operator.layout.RadialTreeLayout;
-	import flare.vis.util.graphics.Shapes;
-	
-	import flash.events.MouseEvent;
-	import flash.geom.Point;
-	import flash.geom.Rectangle;
-	
-	public class GraphView extends Demo
-	{
-		private var vis:Visualization;
-		private var os:OperatorSwitch;
-		private var anchors:Array;
-		private var shape:int = 0;
-		
-		public function GraphView() {
-			name = "GraphView";
-			var w:Number = WIDTH;
-			var h:Number = HEIGHT;
-			
-			var data:Data = GraphUtil.diamondTree(3,3,3);
-			vis = new Visualization(data);
-			vis.bounds = new Rectangle(0,0,w,h);
-			
-			os = new OperatorSwitch(
-				new ForceDirectedLayout(),
-				new NodeLinkTreeLayout(Orientation.LEFT_TO_RIGHT, 20, 5, 10),
-				new IndentedTreeLayout(20),
-				new RadialTreeLayout(50, false),
-				new CircleLayout()
-			);
-			anchors = [
-				null,
-				new Point(40, h/2),
-				new Point(40, 40),
-				new Point(w/2, h/2),
-				new Point(0, 0)
-			];
-			os.index = 1;
-			vis.marks.x = anchors[1].x;
-			vis.marks.y = anchors[1].y;
-
-			vis.operators.add(os);
-			vis.tree.nodes.visit(function(n:NodeSprite):void {
-				n.fillColor = 0xaaaaaa; n.fillAlpha = 0.5;
-				n.lineColor = 0xdddddd; n.lineAlpha = 0.8;
-				n.lineWidth = 1;
-				n.buttonMode = true;
-			});
-			vis.update();
-			addChild(vis);
-			
-			//vis.controls.add(new ExpandControl());
-			//vis.controls.add(new PanZoomControl());
-			vis.controls.add(new DragControl());
-
-			// add reset button, and tie it to reset the layout
-			for (var i:uint=0; i<os.length; ++i) {
-				var txt:String = String(os[i]);
-				var b:Button = new Button(txt.substring(7, txt.length-1));
-				b.props.index = i;
-				b.addEventListener(MouseEvent.CLICK, function(event:MouseEvent):void
-				{
-					switchLayout(event.target.props.index).play();
-				});
-				b.x = WIDTH - 10 - b.width;
-				b.y = 10 + i*28;
-				addChild(b);
-			}
-			
-			var btn:Button = new Button("Starburst");
-			btn.addEventListener(MouseEvent.CLICK, function(evt:MouseEvent):void
-			{
-				toStarburst().play();
-			});
-			
-			btn.x = 10;
-			btn.y = HEIGHT - 10 - btn.height;
-			addChild(btn);
-		}
-		
-		private function switchLayout(idx:int):Transition
-		{
-			vis.operators.clear();
-			vis.operators.add(os);
-			vis.continuousUpdates = false;
-			vis.operators[0].index = idx;
-			
-			var seq:Sequence;
-			if (shape != 0) {
-				seq = new Sequence(
-					vis.data.nodes.setProperties({scaleX:0, scaleY:0}, 0.5),
-					vis.data.nodes.setProperties({shape:0, lineColor:0xffdddddd}, 0.5),
-					vis.data.nodes.setProperties({scaleX:1, scaleY:1}, 0),
-					vis.data.edges.setProperties({lineColor:0xffcccccc}, 0.5)
-				);
-			} else {
-				seq = new Sequence();
-			}
-			
-			shape = 0;
-			if (idx > 0) {
-				seq.onEnd = function():void {
-					var t:Transitioner = new Transitioner(2);
-					t.$(vis.marks).x = anchors[idx].x;
-					t.$(vis.marks).y = anchors[idx].y;
-					vis.update(t).play();
-				};
-			} else {
-				seq.onEnd = function():void { vis.continuousUpdates = true; };
-			}
-			return seq;
-		}
-		
-		private function toStarburst():Transition
-		{
-			vis.operators.clear();
-			vis.operators.add(new RadialTreeLayout(50,false));
-			var t0:Transitioner = new Transitioner(2);				
-
-			t0.$(vis.marks).x = WIDTH/2;
-			t0.$(vis.marks).y = HEIGHT/2;
-			if (shape == Shapes.WEDGE) {
-				return vis.update(t0);
-			} else {
-				shape = Shapes.WEDGE;
-				return new Sequence(
-					vis.update(t0),
-					vis.data.edges.setProperties({lineColor:0}, 0.5),
-					vis.data.nodes.setProperties({scaleX:0, scaleY:0}, 0.5),
-					vis.data.nodes.setProperties({shape:Shapes.WEDGE, lineColor:0xffffffff}, 0),
-					vis.data.nodes.setProperties({scaleX:1, scaleY:1}, 0.5)
-				);
-			}
-		}
-		
-		public override function play():void
-		{
-			var os:OperatorSwitch = vis.operators.getOperatorAt(0) as OperatorSwitch;
-			if (os.index == 0)
-				vis.continuousUpdates = true;
-		}
-		
-		public override function stop():void
-		{
-			vis.continuousUpdates = false;
-		}
-		
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.demos/flare/demos/Pie.as b/grade/report/visual/flare_visualization/flare/flare.demos/flare/demos/Pie.as
deleted file mode 100644
index 485146d92d..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.demos/flare/demos/Pie.as
+++ /dev/null
@@ -1,60 +0,0 @@
-package flare.demos
-{
-	import flare.vis.data.Data;
-	import flare.vis.Visualization;
-	import flare.vis.operator.layout.PieLayout;
-	import flare.vis.operator.encoder.ColorEncoder;
-	import flare.vis.data.DataSprite;
-	import flare.vis.util.graphics.Shapes;
-	import flash.events.MouseEvent;
-	import flare.animate.Tween;
-	import flare.animate.Transitioner;
-	import flare.util.Button;
-	
-	public class Pie extends Demo
-	{
-		public function Pie() {
-			name = "Pie";
-			
-			// create pie chart
-			var vis:Visualization = new Visualization(getData(16));
-			vis.data.nodes.setProperties({
-				shape: Shapes.WEDGE,
-				lineAlpha: 0
-			});
-			vis.operators.add(new PieLayout("data.value", 0.7));
-			vis.operators.add(new ColorEncoder("data.value",1,"fillColor"));
-			vis.update();
-			
-			addChild(vis);
-			
-			vis.x = (WIDTH - vis.bounds.width) / 2;
-			vis.y = (HEIGHT - vis.bounds.height) / 2;
-			
-			// expand / collapse button
-			var btn:Button = new Button("Expand / Collapse");
-			var collapse:Boolean = true;
-			btn.addEventListener(MouseEvent.CLICK, function(evt:MouseEvent):void
-			{
-				var t:Transitioner = new Transitioner(1);
-				vis.data.nodes.visit(function(d:DataSprite):void {
-					t.$(d).v = collapse ? 0 : d.h * 0.7;
-				});
-				collapse = !collapse;
-				t.play();
-			});
-			btn.x = 10;
-			btn.y = HEIGHT - 10 - btn.height;
-			addChild(btn);
-		}
-		
-		public static function getData(N:int):Data
-		{
-			var data:Data = new Data();
-			for (var i:uint=0; i<N; ++i) {
-				data.addNode({id:i, value:Math.random()});
-			}
-			return data;
-		}
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.demos/flare/demos/Smoke.as b/grade/report/visual/flare_visualization/flare/flare.demos/flare/demos/Smoke.as
deleted file mode 100644
index eaa78f6378..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.demos/flare/demos/Smoke.as
+++ /dev/null
@@ -1,107 +0,0 @@
-package flare.demos
-{
-	import flash.display.Sprite;
-	import flare.physics.Simulation;
-	import flash.utils.Dictionary;
-	import flare.physics.Particle;
-	import flash.events.Event;
-	import flash.display.Shape;
-	import flare.animate.ISchedulable;
-	import flare.animate.Scheduler;
-
-	/**
-	 * Simple smoke simulation.
-	 * Based on the smoke example from the traer physics library
-	 * for processing (http://www.cs.princeton.edu/~traer/physics/).
-	 */
-	public class Smoke extends Demo implements ISchedulable
-	{
-		private var _shapes:Array = new Array();
-		private var _spool:Array = new Array();
-		private var _sim:Simulation;
-		private var _dict:Dictionary;
-		private var _last:Particle;
-		private var _life:Number = 62;
-		
-		public function Smoke()
-		{
-			name = "Smoke";
-			_shapes = new Array();
-			_sim = new Simulation(0, -0.1, 0.001, 0);
-			_dict = new Dictionary();
-			_last = null;
-		}
-
-		override public function play():void
-		{
-			Scheduler.instance.add(this);
-		}
-		
-		override public function stop():void
-		{
-			Scheduler.instance.remove(this);
-		}
-
-		public function evaluate(t:Number) : Boolean
-		{
-			drawSmoke();
-			return false;
-		}
-
-		private function getShape():Shape
-		{
-			var s:Shape;
-			if (_spool.length > 0) {
-				s = _spool.pop();
-				s.alpha = 1;
-			} else {
-				s = new Shape();
-				s.graphics.beginFill(0x0);
-				s.graphics.drawEllipse(-10,-10,20,20);
-				s.graphics.endFill();
-			}
-			return s;
-		}
-		
-		private function reclaim(s:Shape):void
-		{
-			_spool.push(s);
-		}
-
-		private function drawSmoke():void
-		{				
-			for (var i:uint = 0; i<5; ++i) {
-				var p:Particle = _sim.addParticle(1, root.mouseX, root.mouseY-10);
-				
-				var s:Shape = getShape();
-				_dict[s] = p;
-				_shapes.push(s);
-				addChild(s);
-					
-				p.vx = 2 * (Math.random()-0.5);
-				p.vy = (3 * Math.random()) - 5;
-				if (_last != null) {
-					_sim.addSpring(p, _last, 10, 0.1, 0.1);
-				}
-				_last = p;
-			}
-			_sim.tick();
-
-			for (i = _shapes.length; --i >= 0; ) {
-				s = _shapes[i] as Shape;
-				p = _dict[s] as Particle;
-				
-				if (p.die) {
-					_shapes.splice(i, 1);
-					reclaim(s);
-					removeChild(s);
-				} else {
-					if (p.age > _life) p.kill();
-					s.x = p.x;
-					s.y = p.y;
-					s.alpha = 1/(p.age+1);
-				}
-			}
-  		}
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.demos/flare/demos/Stacks.as b/grade/report/visual/flare_visualization/flare/flare.demos/flare/demos/Stacks.as
deleted file mode 100644
index 1d1bb237d9..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.demos/flare/demos/Stacks.as
+++ /dev/null
@@ -1,95 +0,0 @@
-package flare.demos
-{
-	import flare.vis.data.Data;
-	import flare.vis.Visualization;
-	import flare.vis.operator.layout.StackedAreaLayout;
-	import flare.vis.data.DataSprite;
-	import flare.util.Colors;
-	import flare.vis.util.graphics.Shapes;
-	import flash.display.StageQuality;
-	import flash.events.MouseEvent;
-	import flare.animate.Transitioner;
-	import flare.animate.Tween;
-	import flare.vis.operator.layout.Layout;
-	import flare.vis.axis.CartesianAxes;
-	import flare.vis.scale.OrdinalScale;
-	import flare.util.Button;
-	
-	public class Stacks extends Demo
-	{
-		private var vis:Visualization;
-		private var t:Transitioner;
-		private var thresh:Number;
-		
-		public function Stacks() {
-			name = "Stacks";
-			
-			var dataset:Object = getData(200);
-			
-			vis = new Visualization(dataset.data);
-			vis.bounds.width = WIDTH-100;
-			vis.bounds.height = HEIGHT-90;
-			vis.operators.add(new StackedAreaLayout(dataset.columns));
-			vis.data.nodes.visit(function(d:DataSprite):void {
-				d.fillColor = Colors.rgba(0xAA,0xAA,100 + uint(155*Math.random()));
-				d.fillAlpha = 1;
-				d.lineAlpha = 0;
-				d.shape = Shapes.POLYGON;
-			});
-			vis.update();
-			addChild(vis);
-			
-			vis.x = 60;
-			vis.y = 15;
-			
-			// random filter button
-			var b:Button = new Button("Filter");
-			b.addEventListener(MouseEvent.CLICK, function(evt:MouseEvent):void
-			{
-				t = new Transitioner(1.5);
-				thresh = 0.25 + 0.75 * Math.random();
-				vis.data.nodes.visit(filter);
-				
-				t.onStart = function():void { stage.quality = StageQuality.LOW; }
-				t.onEnd = function():void { stage.quality = StageQuality.HIGH; }
-				
-				vis.update(t).play();
-			});
-			b.x = 10; b.y = HEIGHT - 10 - b.height;
-			addChild(b);
-		}
-		
-		public function filter(d:DataSprite):void
-		{
-			t.$(d).visible = Math.random() < thresh;
-		}
-	
-		public static function getData(N:int):Object
-		{
-			var cols:Array = [-3,1,3,4,5,6,7,8,9,10];
-			var i:uint, col:String;
-			
-			var data:Data = new Data();
-			for (i=0; i<N; ++i) {
-				var d:DataSprite = data.addNode();
-				var j:uint = 0, s:Number;
-				for each (col in cols) {
-					s = 1 + int((j++)/2);
-					d.data[col] = s*Math.random();
-				}
-			}
-			
-			return { data:data, columns:cols };
-		}
-		
-		public override function play():void
-		{
-			//stage.quality = StageQuality.LOW;
-		}
-		
-		public override function stop():void
-		{
-			//stage.quality = StageQuality.HIGH;
-		}
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.demos/flare/demos/Timeline.as b/grade/report/visual/flare_visualization/flare/flare.demos/flare/demos/Timeline.as
deleted file mode 100644
index 582a8a7f99..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.demos/flare/demos/Timeline.as
+++ /dev/null
@@ -1,93 +0,0 @@
-package flare.demos
-{
-	import flare.animate.Transitioner;
-	import flare.display.TextSprite;
-	import flare.util.Button;
-	import flare.util.Maths;
-	import flare.vis.Visualization;
-	import flare.vis.controls.DragControl;
-	import flare.vis.data.Data;
-	import flare.vis.operator.encoder.ColorEncoder;
-	import flare.vis.operator.layout.AxisLayout;
-	import flare.vis.operator.layout.ForceDirectedLayout;
-	import flare.vis.scale.ScaleType;
-	import flare.vis.util.Filters;
-	
-	import flash.events.MouseEvent;
-	import flash.geom.Rectangle;
-	
-	public class Timeline extends Demo
-	{
-		public function Timeline() {
-			name = "Timeline";
-			
-			var vis:Visualization = new Visualization(getTimeline(50, 3));
-			vis.bounds = new Rectangle(0, 0, 600, 100);
-			vis.operators.add(new AxisLayout("data.date", "data.count"));
-			vis.operators.add(new ColorEncoder(
-				"data.series", Data.EDGES, "lineColor", ScaleType.CATEGORIES));
-			vis.operators.add(new ColorEncoder(
-				"data.series", Data.NODES, "fillColor", ScaleType.CATEGORIES));
-			vis.data.nodes.setProperty("alpha", 0.5);
-			
-			with (vis.xyAxes.xAxis) {
-				horizontalAnchor = TextSprite.LEFT;
-				verticalAnchor = TextSprite.MIDDLE;
-				labelAngle = Math.PI / 2;
-				axisScale.flush = true;	
-			}
-			vis.update();
-			addChild(vis);
-			
-			vis.data.edges.setProperty("lineWidth", 2);
-			vis.data.nodes.setProperty("lineAlpha", 0);
-			vis.data.nodes.setProperty("size", 0.5);
-			
-			vis.x = vis.y = 40;
-			
-			var btn:Button = new Button("Bad Idea!");
-			btn.x = 10; btn.y = HEIGHT - 10 - btn.height;
-			btn.addEventListener(MouseEvent.CLICK, function(evt:MouseEvent):void
-			{
-				// create new force-directed layout that enforces the bounds
-				var fdl:ForceDirectedLayout = new ForceDirectedLayout(true);
-				fdl.defaultSpringLength = 20;
-				fdl.layoutBounds = new Rectangle(0, 0, 600, 400);
-				vis.operators.setOperatorAt(0, fdl);
-				vis.continuousUpdates = true;
-				
-				var t:Transitioner = new Transitioner(1);
-				vis.data.nodes.setProperties({buttonMode:true, scaleX:2, scaleY:2}, t);
-				fdl.hideAxes(t).play();
-				
-				new DragControl(vis, Filters.isNodeSprite);
-				removeChild(btn);
-			});
-			addChild(btn);
-		}
-		
-		public static function getTimeline(N:int, M:int):Data
-		{
-			var MAX:Number = 60;
-			var t0:Date = new Date(1979,5,15);
-			var t1:Date = new Date(1982,2,19);
-			var x:Number, f:Number;
-			
-			var data:Data = new Data();
-			for (var i:uint=0; i<N; ++i) {
-				for (var j:uint=0; j<M; ++j) {
-					f = i/(N-1);
-					x = t0.time + f*(t1.time - t0.time);
-					data.addNode({
-						series: int(j),
-						date: new Date(x),
-						count:int((j*MAX/M) + MAX/M * (1+Maths.noise(13*f,j)))
-					});
-				}
-			}
-			data.createEdges("data.date", "data.series");
-
-			return data;
-		}
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.demos/flare/demos/TreeMap.as b/grade/report/visual/flare_visualization/flare/flare.demos/flare/demos/TreeMap.as
deleted file mode 100644
index 22bc657536..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.demos/flare/demos/TreeMap.as
+++ /dev/null
@@ -1,67 +0,0 @@
-package flare.demos
-{
-	import flash.events.Event;
-	import flare.vis.data.NodeSprite;
-	import flare.vis.data.Tree;
-	import flare.vis.data.EdgeSprite;
-	import flare.vis.operator.layout.Layout;
-	import flare.vis.operator.layout.TreeMapLayout;
-	import flash.geom.Rectangle;
-	import flare.util.GraphUtil;
-	import flare.vis.data.DataSprite;
-	import flash.display.StageQuality;
-	import flare.util.Colors;
-	import flare.vis.Visualization;
-	import flash.events.MouseEvent;
-	import flash.display.Sprite;
-	import flash.display.DisplayObjectContainer;
-	import flare.vis.util.graphics.Shapes;
-	import flare.vis.data.Data;
-	import flare.vis.controls.HoverControl;
-	import flare.vis.util.Filters;
-	
-	public class TreeMap extends Demo
-	{
-		public function TreeMap() {
-			name = "TreeMap";
-			var tree:Tree = GraphUtil.balancedTree(4,5);
-			var e:EdgeSprite, n:NodeSprite;
-			
-			var vis:Visualization = new Visualization(tree);
-			vis.tree.nodes.visit(function(n:NodeSprite):void {
-				n.size = Math.random();
-				n.shape = Shapes.BLOCK;
-				n.fillColor = 0xff8888FF; n.lineColor = 0;
-				n.fillAlpha = n.lineAlpha = n.depth / 25;
-			});
-			vis.data.edges.setProperty("visible", false);
-			vis.operators.add(new TreeMapLayout());
-			vis.bounds = new Rectangle(0, 0, WIDTH, HEIGHT);		
-			vis.update();
-			addChild(vis);
-			
-			var hc:HoverControl = new HoverControl(null, 
-				Filters.isNodeSprite, HoverControl.MOVE_AND_RETURN);
-			hc.onRollOver = function(n:NodeSprite):void {
-				n.lineColor = 0xffFF0000; n.lineWidth = 2;
-				n.fillColor = 0xffFFFFAAAA; 
-			};
-			hc.onRollOut = function(n:NodeSprite):void {
-				n.lineColor = 0; n.lineWidth = 0;
-				n.fillColor = 0xff8888FF;
-				n.fillAlpha = n.lineAlpha = n.depth / 25;
-			}
-			vis.controls.add(hc);
-		}
-		
-		public override function play():void
-		{
-			stage.quality = StageQuality.LOW;
-		}
-		
-		public override function stop():void
-		{
-			stage.quality = StageQuality.HIGH;
-		}
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.demos/flare/util/Button.as b/grade/report/visual/flare_visualization/flare/flare.demos/flare/util/Button.as
deleted file mode 100644
index ef0dcf5456..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.demos/flare/util/Button.as
+++ /dev/null
@@ -1,59 +0,0 @@
-package flare.util
-{
-	import flash.display.SimpleButton;
-	import flash.text.TextField;
-	import flash.text.TextFormat;
-
-	public class Button extends SimpleButton
-	{
-		private var upColor:uint   = 0xDDDDDD;
-    	private var overColor:uint = 0xEAEAEA;
-    	private var downColor:uint = 0xCCCCCC;
-    	private var fmt:TextFormat = new TextFormat("Arial",16,0,null,null,null,null,null,"center");
-    	
-    	public var props:Object = new Object();
-		
-		public function Button(text:String)
-		{
-			downState      = new ButtonDisplayState(text, fmt, downColor);
-        	overState      = new ButtonDisplayState(text, fmt, overColor);
-        	upState        = new ButtonDisplayState(text, fmt, upColor);
-        	hitTestState   = upState;
-        	useHandCursor  = true;	
-		}
-	}
-}
-
-import flash.display.Sprite;
-import flash.text.TextField;
-import flash.text.TextFormat;
-import flash.text.TextFieldAutoSize;
-import flare.display.TextSprite;
-
-class ButtonDisplayState extends Sprite
-{
-    private var bgColor:uint;
-    private var w:uint;
-    private var h:uint;
-
-    public function ButtonDisplayState(text:String, fmt:TextFormat, bgColor:uint) {//, w:uint, h:uint) {
-        this.bgColor = bgColor;
-
-		var ts:TextSprite = new TextSprite(text, fmt);
-		var tf:TextField = ts.textField;
-		
-        w = tf.width = tf.textWidth + 6;
-        h = tf.height = tf.textHeight + 4;
-		ts.dirty();
-		
-        addChild(ts);
-        draw();
-    }
-
-    private function draw():void {
-        graphics.beginFill(bgColor);
-        graphics.lineStyle(1, 0xaaaaaa, 1, true);
-        graphics.drawRoundRect(0, 0, w, h, 8, 8);
-        graphics.endFill();
-    }
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.demos/flare/util/GraphUtil.as b/grade/report/visual/flare_visualization/flare/flare.demos/flare/util/GraphUtil.as
deleted file mode 100644
index 87bf45923e..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.demos/flare/util/GraphUtil.as
+++ /dev/null
@@ -1,268 +0,0 @@
-package flare.util
-{
-	import flare.vis.data.NodeSprite;
-	import flare.vis.data.Data;
-	import flare.vis.data.Tree;
-	
-	public class GraphUtil
-	{
-		public static function printTree(n:NodeSprite, d:int) : void
-		{
-			/*
-			var s:String = "";
-			for (var k:uint = 0; k < d; k++) {
-				s += "  ";
-			}
-			trace(s+n.name+" ("+n.x+", "+n.y+", "+n.w+", "+n.h+")");
-			*/
-			trace(n.name+"\t"+n.u+"\t"+n.v+"\t"+n.w+"\t"+n.h);
-			for (var i:uint = 0; i < n.childDegree; ++i) {
-				printTree(n.getChildNode(i), d+1);
-			}
-		}
-	
-		// -- Graph Generators ------------------------------------------------
-		
-		/**
-	     * Builds a completely unconnected (edge-free) graph with the given 
-	     * number of nodes
-	     * @param n the number of nodes
-	     * @return a graph with n nodes and no edges
-	     */
-	    public static function nodes(n:uint):Data
-	    {
-	        var g:Data = new Data();
-	        for (var i:uint=0; i < n; i++) {
-	            var node:NodeSprite = g.addNode();
-	            node.data.label = String(i);
-	        }
-	        return g;
-	    }
-	    
-	    /**
-	     * Builds a "star" graph with one central hub connected to the given
-	     * number of satellite nodes.
-	     * @param n the number of points of the star
-	     * @return a "star" graph with n points, for a total of n+1 nodes
-	     */
-	    public static function star(n:uint):Data
-	    {
-	        var g:Data = new Data();
-	        
-	        var r:NodeSprite = g.addNode();
-	        r.data.label = "0";
-	        
-	        for (var i:uint=1; i <= n; ++i) {
-	            var nn:NodeSprite = g.addNode();
-	            nn.data.label = String(i);
-	            g.addEdgeFor(r, nn);
-	        }
-	        return g;
-	    }
-	    
-	    /**
-	     * Returns a clique of given size. A clique is a graph in which every node
-	     * is a neighbor of every other node.
-	     * @param n the number of nodes in the graph
-	     * @return a clique of size n
-	     */
-	    public static function clique(n:uint):Data
-	    {
-	        var g:Data = new Data();
-	        var i:uint, j:uint;
-	        
-	        var nodes:Array = new Array(n);
-	        for (i=0; i < n; ++i) {
-	            nodes[i] = g.addNode();
-	            nodes[i].data.label = String(i);
-	        }
-	        for (i=0; i < n; ++i) {
-	            for (j=i; j < n; ++j)
-	                if (i != j)
-	                    g.addEdgeFor(nodes[i], nodes[j]);
-	        }
-	        return g;
-	    }
-	    
-	    /**
-	     * Returns a graph structured as an m-by-n grid.
-	     * @param m the number of rows of the grid
-	     * @param n the number of columns of the grid
-	     * @return an m-by-n grid structured graph
-	     */
-	    public static function grid(m:uint, n:uint):Data
-	    {
-	        var g:Data = new Data();
-	        
-	        var nodes:Array = new Array(m*n);
-	        for (var i:uint=0; i < m*n; ++i) {
-	            nodes[i] = g.addNode();
-	            nodes[i].data.label = String(i);
-	            
-	            if (i >= n)
-	                g.addEdgeFor(nodes[i-n], nodes[i]);
-	            if (i % n != 0)
-	                g.addEdgeFor(nodes[i-1], nodes[i]);
-	        }
-	        return g;
-	    }
-	    
-	    public static function honeycomb(levels:uint):Data
-	    {
-	        var g:Data = new Data();
-	        var layer1:Array = halfcomb(g, levels);
-	        var layer2:Array = halfcomb(g, levels);
-	        for (var i:uint=0; i<(levels<<1); ++i) {
-	            var n1:NodeSprite = layer1[i];
-	            var n2:NodeSprite = layer2[i];
-	            g.addEdgeFor(n1, n2);
-	        }
-	        return g;
-	    }
-	    
-	    private static function halfcomb(g:Data, levels:uint):Array
-	    {
-	    	var top:Array = new Array();
-	    	var layer:Array = new Array();
-	        var label:uint = 0, i:uint, j:uint;
-	        
-	        for (i=0; i<levels; ++i) {
-	            var n:NodeSprite = g.addNode();
-	            n.data.label = String(label++);
-	            top.push(n);
-	        }
-	        for (i=0; i<levels; ++i) {
-	            n = null;
-	            for (j=0; j<top.length; ++j) {
-	                var p:NodeSprite = top[j];
-	                if (n == null) {
-	                    n = g.addNode();
-	                    n.data.label = String(label++);
-	                    layer.push(n);
-	                }
-	                g.addEdgeFor(p, n);
-	                n = g.addNode();
-	                n.data.label = String(label++);
-	                layer.push(n);
-	                g.addEdgeFor(p, n);
-	            }
-	            if (i == levels-1) {
-	                return layer;
-	            }
-	            top.splice(0, top.length);
-	            for (j=0; j<layer.length; ++j) {
-	                p = layer[j];
-	                n = g.addNode();
-	                n.data.label = String(label++);
-	                top.push(n);
-	                g.addEdgeFor(p, n);
-	            }
-	            layer.splice(0, layer.length);
-	        }
-	        // should never happen
-	        return top;
-	    }
-	    
-	    /**
-	     * Returns a balanced tree of the requested breadth and depth.
-	     * @param breadth the breadth of each level of the tree
-	     * @param depth the depth of the tree
-	     * @return a balanced tree
-	     */
-	    public static function balancedTree(breadth:uint, depth:uint):Tree
-	    {
-	    	var t:Tree = new Tree();
-	        var r:NodeSprite = t.addRoot();
-	        r.data.label = "0,0";
-	        
-	        if (depth > 0)
-	            balancedHelper(t, r, breadth, depth-1);
-	        return t;
-	    }
-	    
-	    private static function balancedHelper(t:Tree, n:NodeSprite, 
-	            breadth:uint, depth:uint):void
-	    {
-	        for (var i:uint=0; i<breadth; ++i) {
-	            var c:NodeSprite = t.addChild(n);
-	            c.data.label = i+","+c.depth;
-	            if (depth > 0)
-	                balancedHelper(t,c,breadth,depth-1);
-	        }
-	    }
-	    
-	    /**
-	     * Returns a left deep binary tree
-	     * @param depth the depth of the tree
-	     * @return the generated tree
-	     */
-	    public static function leftDeepTree(depth:uint):Tree
-	    {
-	        var t:Tree = new Tree();
-			var r:NodeSprite = t.addRoot();
-	        r.data.label = "0,0";
-	        
-	        deepHelper(t, r, 2, depth, true);
-	        return t;
-	    }
-	    
-	    /**
-	     * Returns a right deep binary tree
-	     * @param depth the depth of the tree
-	     * @return the generated Tree
-	     */
-	    public static function rightDeepTree(depth:uint):Tree
-	    {
-	        var t:Tree = new Tree();
-			var r:NodeSprite = t.addRoot();
-	        r.data.label = "0,0";
-	        
-	        deepHelper(t, r, 2, depth, false);
-	        return t;
-	    }
-		
-		/**
-    	 * Create a diamond tree, with a given branching factor at
-    	 * each level, and depth levels for the two main branches.
-    	 * @param b the number of children of each branch node
-    	 * @param d1 the length of the first (left) branch
-    	 * @param d2 the length of the second (right) branch
-    	 * @return the generated Tree
-    	 */
-		public static function diamondTree(b:int, d1:int, d2:int) : Tree
-		{
-			var tree:Tree = new Tree();
-			var n:NodeSprite = tree.addRoot();
-			var l:NodeSprite = tree.addChild(n);
-			var r:NodeSprite = tree.addChild(n);
-            
-            deepHelper(tree, l, b, d1-2, true);
-        	deepHelper(tree, r, b, d1-2, false);
-        
-			while (l.firstChildNode != null)
-				l = l.firstChildNode;
-			while (r.lastChildNode != null)
-				r = r.lastChildNode;
-        	
-        	deepHelper(tree, l, b, d2-1, false);
-        	deepHelper(tree, r, b, d2-1, true);
-        
-        	return tree;
-  		}
-    
-		private static function deepHelper(t:Tree, n:NodeSprite,
-			breadth:int, depth:int, left:Boolean) : void
-		{
-			var c:NodeSprite = t.addChild(n);
-			if (left && depth > 0)
-				deepHelper(t, c, breadth, depth-1, left);
-			
-			for (var i:uint = 1; i<breadth; ++i) {
-				c = t.addChild(n);
-			}
-			
-			if (!left && depth > 0)
-				deepHelper(t, c, breadth, depth-1, left);
-		}
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.demos/html-template/AC_OETags.js b/grade/report/visual/flare_visualization/flare/flare.demos/html-template/AC_OETags.js
deleted file mode 100644
index 2fb2fe9823..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.demos/html-template/AC_OETags.js
+++ /dev/null
@@ -1,275 +0,0 @@
-// Flash Player Version Detection - Rev 1.6
-// Detect Client Browser type
-// Copyright(c) 2005-2006 Adobe Macromedia Software, LLC. All rights reserved.
-var isIE  = (navigator.appVersion.indexOf("MSIE") != -1) ? true : false;
-var isWin = (navigator.appVersion.toLowerCase().indexOf("win") != -1) ? true : false;
-var isOpera = (navigator.userAgent.indexOf("Opera") != -1) ? true : false;
-
-function ControlVersion()
-{
-	var version;
-	var axo;
-	var e;
-
-	// NOTE : new ActiveXObject(strFoo) throws an exception if strFoo isn't in the registry
-
-	try {
-		// version will be set for 7.X or greater players
-		axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.7");
-		version = axo.GetVariable("$version");
-	} catch (e) {
-	}
-
-	if (!version)
-	{
-		try {
-			// version will be set for 6.X players only
-			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.6");
-			
-			// installed player is some revision of 6.0
-			// GetVariable("$version") crashes for versions 6.0.22 through 6.0.29,
-			// so we have to be careful. 
-			
-			// default to the first public version
-			version = "WIN 6,0,21,0";
-
-			// throws if AllowScripAccess does not exist (introduced in 6.0r47)		
-			axo.AllowScriptAccess = "always";
-
-			// safe to call for 6.0r47 or greater
-			version = axo.GetVariable("$version");
-
-		} catch (e) {
-		}
-	}
-
-	if (!version)
-	{
-		try {
-			// version will be set for 4.X or 5.X player
-			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.3");
-			version = axo.GetVariable("$version");
-		} catch (e) {
-		}
-	}
-
-	if (!version)
-	{
-		try {
-			// version will be set for 3.X player
-			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.3");
-			version = "WIN 3,0,18,0";
-		} catch (e) {
-		}
-	}
-
-	if (!version)
-	{
-		try {
-			// version will be set for 2.X player
-			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash");
-			version = "WIN 2,0,0,11";
-		} catch (e) {
-			version = -1;
-		}
-	}
-	
-	return version;
-}
-
-// JavaScript helper required to detect Flash Player PlugIn version information
-function GetSwfVer(){
-	// NS/Opera version >= 3 check for Flash plugin in plugin array
-	var flashVer = -1;
-	
-	if (navigator.plugins != null && navigator.plugins.length > 0) {
-		if (navigator.plugins["Shockwave Flash 2.0"] || navigator.plugins["Shockwave Flash"]) {
-			var swVer2 = navigator.plugins["Shockwave Flash 2.0"] ? " 2.0" : "";
-			var flashDescription = navigator.plugins["Shockwave Flash" + swVer2].description;
-			var descArray = flashDescription.split(" ");
-			var tempArrayMajor = descArray[2].split(".");			
-			var versionMajor = tempArrayMajor[0];
-			var versionMinor = tempArrayMajor[1];
-			var versionRevision = descArray[3];
-			if (versionRevision == "") {
-				versionRevision = descArray[4];
-			}
-			if (versionRevision[0] == "d") {
-				versionRevision = versionRevision.substring(1);
-			} else if (versionRevision[0] == "r") {
-				versionRevision = versionRevision.substring(1);
-				if (versionRevision.indexOf("d") > 0) {
-					versionRevision = versionRevision.substring(0, versionRevision.indexOf("d"));
-				}
-			}
-			var flashVer = versionMajor + "." + versionMinor + "." + versionRevision;
-		}
-	}
-	// MSN/WebTV 2.6 supports Flash 4
-	else if (navigator.userAgent.toLowerCase().indexOf("webtv/2.6") != -1) flashVer = 4;
-	// WebTV 2.5 supports Flash 3
-	else if (navigator.userAgent.toLowerCase().indexOf("webtv/2.5") != -1) flashVer = 3;
-	// older WebTV supports Flash 2
-	else if (navigator.userAgent.toLowerCase().indexOf("webtv") != -1) flashVer = 2;
-	else if ( isIE && isWin && !isOpera ) {
-		flashVer = ControlVersion();
-	}	
-	return flashVer;
-}
-
-// When called with reqMajorVer, reqMinorVer, reqRevision returns true if that version or greater is available
-function DetectFlashVer(reqMajorVer, reqMinorVer, reqRevision)
-{
-	versionStr = GetSwfVer();
-	if (versionStr == -1 ) {
-		return false;
-	} else if (versionStr != 0) {
-		if(isIE && isWin && !isOpera) {
-			// Given "WIN 2,0,0,11"
-			tempArray         = versionStr.split(" "); 	// ["WIN", "2,0,0,11"]
-			tempString        = tempArray[1];			// "2,0,0,11"
-			versionArray      = tempString.split(",");	// ['2', '0', '0', '11']
-		} else {
-			versionArray      = versionStr.split(".");
-		}
-		var versionMajor      = versionArray[0];
-		var versionMinor      = versionArray[1];
-		var versionRevision   = versionArray[2];
-
-        	// is the major.revision >= requested major.revision AND the minor version >= requested minor
-		if (versionMajor > parseFloat(reqMajorVer)) {
-			return true;
-		} else if (versionMajor == parseFloat(reqMajorVer)) {
-			if (versionMinor > parseFloat(reqMinorVer))
-				return true;
-			else if (versionMinor == parseFloat(reqMinorVer)) {
-				if (versionRevision >= parseFloat(reqRevision))
-					return true;
-			}
-		}
-		return false;
-	}
-}
-
-function AC_AddExtension(src, ext)
-{
-  if (src.indexOf('?') != -1)
-    return src.replace(/\?/, ext+'?'); 
-  else
-    return src + ext;
-}
-
-function AC_Generateobj(objAttrs, params, embedAttrs) 
-{ 
-    var str = '';
-    if (isIE && isWin && !isOpera)
-    {
-  		str += '<object ';
-  		for (var i in objAttrs)
-  			str += i + '="' + objAttrs[i] + '" ';
-  		for (var i in params)
-  			str += '><param name="' + i + '" value="' + params[i] + '" /> ';
-  		str += '></object>';
-    } else {
-  		str += '<embed ';
-  		for (var i in embedAttrs)
-  			str += i + '="' + embedAttrs[i] + '" ';
-  		str += '> </embed>';
-    }
-
-    document.write(str);
-}
-
-function AC_FL_RunContent(){
-  var ret = 
-    AC_GetArgs
-    (  arguments, ".swf", "movie", "clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"
-     , "application/x-shockwave-flash"
-    );
-  AC_Generateobj(ret.objAttrs, ret.params, ret.embedAttrs);
-}
-
-function AC_GetArgs(args, ext, srcParamName, classid, mimeType){
-  var ret = new Object();
-  ret.embedAttrs = new Object();
-  ret.params = new Object();
-  ret.objAttrs = new Object();
-  for (var i=0; i < args.length; i=i+2){
-    var currArg = args[i].toLowerCase();    
-
-    switch (currArg){	
-      case "classid":
-        break;
-      case "pluginspage":
-        ret.embedAttrs[args[i]] = args[i+1];
-        break;
-      case "src":
-      case "movie":	
-        args[i+1] = AC_AddExtension(args[i+1], ext);
-        ret.embedAttrs["src"] = args[i+1];
-        ret.params[srcParamName] = args[i+1];
-        break;
-      case "onafterupdate":
-      case "onbeforeupdate":
-      case "onblur":
-      case "oncellchange":
-      case "onclick":
-      case "ondblClick":
-      case "ondrag":
-      case "ondragend":
-      case "ondragenter":
-      case "ondragleave":
-      case "ondragover":
-      case "ondrop":
-      case "onfinish":
-      case "onfocus":
-      case "onhelp":
-      case "onmousedown":
-      case "onmouseup":
-      case "onmouseover":
-      case "onmousemove":
-      case "onmouseout":
-      case "onkeypress":
-      case "onkeydown":
-      case "onkeyup":
-      case "onload":
-      case "onlosecapture":
-      case "onpropertychange":
-      case "onreadystatechange":
-      case "onrowsdelete":
-      case "onrowenter":
-      case "onrowexit":
-      case "onrowsinserted":
-      case "onstart":
-      case "onscroll":
-      case "onbeforeeditfocus":
-      case "onactivate":
-      case "onbeforedeactivate":
-      case "ondeactivate":
-      case "type":
-      case "codebase":
-        ret.objAttrs[args[i]] = args[i+1];
-        break;
-      case "id":
-      case "width":
-      case "height":
-      case "align":
-      case "vspace": 
-      case "hspace":
-      case "class":
-      case "title":
-      case "accesskey":
-      case "name":
-      case "tabindex":
-        ret.embedAttrs[args[i]] = ret.objAttrs[args[i]] = args[i+1];
-        break;
-      default:
-        ret.embedAttrs[args[i]] = ret.params[args[i]] = args[i+1];
-    }
-  }
-  ret.objAttrs["classid"] = classid;
-  if (mimeType) ret.embedAttrs["type"] = mimeType;
-  return ret;
-}
-
-
diff --git a/grade/report/visual/flare_visualization/flare/flare.demos/html-template/deeplinking/deeplinking.css b/grade/report/visual/flare_visualization/flare/flare.demos/html-template/deeplinking/deeplinking.css
deleted file mode 100644
index 5275b55216..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.demos/html-template/deeplinking/deeplinking.css
+++ /dev/null
@@ -1,6 +0,0 @@
-/* This CSS stylesheet defines styles used by required elements in a DeepLinking application page */
-
-#ie_historyFrame { width: 0px; height: 0px; display:none }
-#firefox_anchorDiv { width: 0px; height: 0px; display:none }
-#safari_formDiv { width: 0px; height: 0px; display:none }
-#safari_rememberDiv { width: 0px; height: 0px; display:none }
diff --git a/grade/report/visual/flare_visualization/flare/flare.demos/html-template/deeplinking/deeplinking.js b/grade/report/visual/flare_visualization/flare/flare.demos/html-template/deeplinking/deeplinking.js
deleted file mode 100644
index 87a32b42fd..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.demos/html-template/deeplinking/deeplinking.js
+++ /dev/null
@@ -1,517 +0,0 @@
-DeepLinkingUtils = {
-	addEvent: function(elm, evType, fn, useCapture) {
-		useCapture = useCapture || false;
-		if (elm.addEventListener) {
-			elm.addEventListener(evType, fn, useCapture);
-			return true;
-		}
-		else if (elm.attachEvent) {
-			var r = elm.attachEvent('on' + evType, fn);
-			return r;
-		}
-		else {
-			elm['on' + evType] = fn;
-		}
-	}
-}
-
-DeepLinking = (function() {
-	// type of browser
-    var browser = {
-        ie: false, 
-        firefox: false, 
-        safari: false, 
-        opera: false, 
-        version: -1
-    };
-
-    // Default app state URL to use when no fragment ID present
-    var defaultHash = '';
-
-    // Last-known app state URL
-    var currentHref = document.location.href;
-
-    // Initial URL (used only by IE)
-    var initialHref = document.location.href;
-
-    // Initial URL (used only by IE)
-    var initialHash = document.location.hash;
-
-    // History frame source URL prefix (used only by IE)
-    var historyFrameSourcePrefix = 'deeplinking/historyFrame.html?';
-
-    // History maintenance (used only by Safari)
-    var currentHistoryLength = -1;
-
-    var historyHash = [];
-
-    var initialState = createState(initialHref, initialHref + '#' + initialHash, initialHash);
-
-    var backStack = [];
-    var forwardStack = [];
-
-	//UserAgent detection
-    var useragent = navigator.userAgent.toLowerCase();
-
-    if (useragent.indexOf("opera") != -1) {
-        browser.opera = true;
-    } else if (useragent.indexOf("msie") != -1) {
-        browser.ie = true;
-        browser.version = parseFloat(useragent.substring(useragent.indexOf('msie') + 4));
-    } else if (useragent.indexOf("safari") != -1) {
-        browser.safari = true;
-        browser.version = parseFloat(useragent.substring(useragent.indexOf('safari') + 7));
-    } else if (useragent.indexOf("gecko") != -1) {
-        browser.firefox = true;
-    }
-
-    // Accessor functions for obtaining specific elements of the page.
-    function getHistoryFrame()
-    {
-        return document.getElementById('ie_historyFrame');
-    }
-
-    function getAnchorElement()
-    {
-        return document.getElementById('firefox_anchorDiv');
-    }
-
-    function getFormElement()
-    {
-        return document.getElementById('safari_formDiv');
-    }
-
-	function getRememberElement()
-	{
-		return document.getElementById("safari_remember_field");
-	}
-
-    /* Get the Flash player object for performing ExternalInterface callbacks. */
-    function getPlayer() {
-        var player = null; /* AJH, needed?  = document.getElementById(getPlayerId()); */
-        
-        if (player == null) {
-            player = document.getElementsByTagName('object')[0];
-        }
-        
-        if (player == null || player.object == null) {
-            player = document.getElementsByTagName('embed')[0];
-        }
-
-        return player;
-    }
-
-    /* Get the current location hash excluding the '#' symbol. */
-    function getHash() {
-       // It would be nice if we could use document.location.hash here,
-       // but it's faulty sometimes.
-       var idx = document.location.href.indexOf('#');
-       return (idx >= 0) ? document.location.href.substr(idx+1) : '';
-    }
-
-    /* Get the current location hash excluding the '#' symbol. */
-    function setHash(hash) {
-       // It would be nice if we could use document.location.hash here,
-       // but it's faulty sometimes.
-       if (hash == '') hash = '#'
-       document.location.hash = hash;
-    }
-
-    function createState(baseUrl, newUrl, flexAppUrl) {
-        return { 'baseUrl': baseUrl, 'newUrl': newUrl, 'flexAppUrl': flexAppUrl, 'title': null };
-    }
-
-    /* Add a history entry to the browser.
-     *   baseUrl: the portion of the location prior to the '#'
-     *   newUrl: the entire new URL, including '#' and following fragment
-     *   flexAppUrl: the portion of the location following the '#' only
-     */
-    function addHistoryEntry(baseUrl, newUrl, flexAppUrl, copyToAddressBar) {
-
-        //delete all the history entries
-        forwardStack = [];
-
-        if (browser.ie) {
-            //Check to see if we are being asked to do a navigate for the first
-            //history entry, and if so ignore, because it's coming from the creation
-            //of the history iframe
-            if (flexAppUrl == defaultHash && document.location.href == initialHref && _ie_firstload) {
-                currentHref = initialHref;
-                return;
-            }
-            if ((!flexAppUrl || flexAppUrl == defaultHash) && _ie_firstload) {
-                newUrl = baseUrl + '#' + defaultHash;
-                flexAppUrl = defaultHash;
-            } else {
-                // for IE, tell the history frame to go somewhere without a '#'
-                // in order to get this entry into the browser history.
-                getHistoryFrame().src = historyFrameSourcePrefix + flexAppUrl;
-            }
-            if (copyToAddressBar) {
-                setHash(flexAppUrl);
-                //document.location.href = newUrl;
-            }
-        } else {
-
-            //ADR
-            if (backStack.length == 0 && initialState.flexAppUrl == flexAppUrl) {
-                initialState = createState(baseUrl, newUrl, flexAppUrl);
-            } else if(backStack.length > 0 && backStack[backStack.length - 1].flexAppUrl == flexAppUrl) {
-                backStack[backStack.length - 1] = createState(baseUrl, newUrl, flexAppUrl);
-            }
-
-            if (browser.safari) {
-                // for Safari, submit a form whose action points to the desired URL
-                if (browser.version <= 419.3) {
-                    var file = window.location.pathname.toString();
-                    file = file.substring(file.lastIndexOf("/")+1);
-                    getFormElement().innerHTML = '<form name="historyForm" action="'+file+'#' + flexAppUrl + '" method="GET"></form>';
-                    //get the current elements and add them to the form
-                    var qs = window.location.search.substring(1);
-                    var qs_arr = qs.split("&");
-                    for (var i = 0; i < qs_arr.length; i++) {
-                        var tmp = qs_arr[i].split("=");
-                        var elem = document.createElement("input");
-                        elem.type = "hidden";
-                        elem.name = tmp[0];
-                        elem.value = tmp[1];
-                        document.forms.historyForm.appendChild(elem);
-                    }
-                    document.forms.historyForm.submit();
-                } else {
-                    top.location.hash = flexAppUrl;
-                }
-                // We also have to maintain the history by hand for Safari
-                historyHash[history.length] = flexAppUrl;
-                _storeStates();
-            } else {
-                // Otherwise, write an anchor into the page and tell the browser to go there
-                addAnchor(flexAppUrl);
-                if (copyToAddressBar) {
-                    setHash(flexAppUrl);
-                }
-           }
-        }
-        backStack.push(createState(baseUrl, newUrl, flexAppUrl));
-    }
-
-    function _storeStates() {
-        if (browser.safari) {
-            getRememberElement().value = historyHash.join(",");
-        }
-    }
-
-    function handleBackButton() {
-        //The "current" page is always at the top of the history stack.
-        var current = backStack.pop();
-        if (!current) { return; }
-        var last = backStack[backStack.length - 1];
-        if (!last && backStack.length == 0){
-            last = initialState;
-        }
-        forwardStack.push(current);
-    }
-
-    function handleForwardButton() {
-        //summary: private method. Do not call this directly.
-
-        var last = forwardStack.pop();
-        if (!last) { return; }
-        backStack.push(last);
-    }
-
-    function handleArbitraryUrl() {
-        //delete all the history entries
-        forwardStack = [];
-    }
-
-    /* Called periodically to poll to see if we need to detect navigation that has occurred */
-    function checkForUrlChange() {
-
-        if (browser.ie) {
-            if (currentHref != document.location.href && currentHref + '#' != document.location.href) {
-                //This occurs when the user has navigated to a specific URL
-                //within the app, and didn't use browser back/forward
-                //IE seems to have a bug where it stops updating the URL it
-                //shows the end-user at this point, but programatically it
-                //appears to be correct.  Do a full app reload to get around
-                //this issue.
-                if (browser.version < 7) {
-                    currentHref = document.location.href;
-                    document.location.reload();
-                } else {
-                    //getHistoryFrame().src = historyFrameSourcePrefix + getHash();
-                }
-            }
-		}
-
-		if (browser.safari) {
-            // For Safari, we have to check to see if history.length changed.
-            if (currentHistoryLength >= 0 && history.length != currentHistoryLength) {
-				//alert("did change: " + history.length + ", " + historyHash.length + "|" + historyHash[history.length] + "|>" + historyHash.join("|"));
-                // If it did change, then we have to look the old state up
-                // in our hand-maintained array since document.location.hash
-                // won't have changed, then call back into BrowserManager.
-                currentHistoryLength = history.length;
-                var flexAppUrl = historyHash[currentHistoryLength];
-                if (flexAppUrl == '') {
-                    //flexAppUrl = defaultHash;
-                }
-                getPlayer().browserURLChange(flexAppUrl);
-                _storeStates();
-            }
-		}
-		if (browser.firefox) {
-            if (currentHref != document.location.href) {
-                var bsl = backStack.length;
-
-                var urlActions = {
-                    back: false, 
-                    forward: false, 
-                    set: false
-                }
-
-                if ((window.location.hash == initialHash || window.location.href == initialHref) && (bsl == 1)) {
-                    urlActions.back = true;
-                    // FIXME: could this ever be a forward button?
-                    // we can't clear it because we still need to check for forwards. Ugg.
-                    // clearInterval(this.locationTimer);
-                    handleBackButton();
-                }
-                
-                // first check to see if we could have gone forward. We always halt on
-                // a no-hash item.
-                if (forwardStack.length > 0) {
-                    if (forwardStack[forwardStack.length-1].flexAppUrl == getHash()) {
-                        urlActions.forward = true;
-                        handleForwardButton();
-                    }
-                }
-
-                // ok, that didn't work, try someplace back in the history stack
-                if ((bsl >= 2) && (backStack[bsl - 2])) {
-                    if (backStack[bsl - 2].flexAppUrl == getHash()) {
-                        urlActions.back = true;
-                        handleBackButton();
-                    }
-                }
-                
-                if (!urlActions.back && !urlActions.forward) {
-                    var foundInStacks = {
-                        back: -1, 
-                        forward: -1
-                    }
-
-                    for (var i = 0; i < backStack.length; i++) {
-                        if (backStack[i].flexAppUrl == getHash() && i != (bsl - 2)) {
-                            arbitraryUrl = true;
-                            foundInStacks.back = i;
-                        }
-                    }
-                    for (var i = 0; i < forwardStack.length; i++) {
-                        if (forwardStack[i].flexAppUrl == getHash() && i != (bsl - 2)) {
-                            arbitraryUrl = true;
-                            foundInStacks.forward = i;
-                        }
-                    }
-                    handleArbitraryUrl();
-                }
-
-                // Firefox changed; do a callback into BrowserManager to tell it.
-                currentHref = document.location.href;
-                var flexAppUrl = getHash();
-                if (flexAppUrl == '') {
-                    //flexAppUrl = defaultHash;
-                }
-                getPlayer().browserURLChange(flexAppUrl);
-            }
-        }
-        //setTimeout(checkForUrlChange, 50);
-    }
-
-    /* Write an anchor into the page to legitimize it as a URL for Firefox et al. */
-    function addAnchor(flexAppUrl)
-    {
-       if (document.getElementsByName(flexAppUrl).length == 0) {
-           getAnchorElement().innerHTML += "<a name='" + flexAppUrl + "'>" + flexAppUrl + "</a>";
-       }
-    }
-
-    var _initialize = function () {
-		if (browser.ie)
-		{
-            var scripts = document.getElementsByTagName('script');
-            for (var i = 0, s; s = scripts[i]; i++) {
-                if (s.src.indexOf("deeplinking.js") > -1) {
-                    var iframe_location = (new String(s.src)).replace("deeplinking.js", "historyFrame.html");
-                }
-            }
-			historyFrameSourcePrefix = iframe_location + "?";
-			var src = historyFrameSourcePrefix;
-
-            var iframe = document.createElement("iframe");
-            iframe.id = 'ie_historyFrame';
-            iframe.name = 'ie_historyFrame';
-            //iframe.src = historyFrameSourcePrefix;
-            document.body.appendChild(iframe);
-		}
-
-		if (browser.safari)
-		{
-			var rememberDiv = document.createElement("div");
-			rememberDiv.id = 'asafari_rememberDiv';
-			document.body.appendChild(rememberDiv);
-			rememberDiv.innerHTML = '<input type="text" id="safari_remember_field" style="width: 500px;">';
-
-			var formDiv = document.createElement("div");
-			formDiv.id = 'safari_formDiv';
-			document.body.appendChild(formDiv);
-
-            var reloader_content = document.createElement('div');
-            reloader_content.id = 'safarireloader';
-            var scripts = document.getElementsByTagName('script');
-            for (var i = 0, s; s = scripts[i]; i++) {
-                if (s.src.indexOf("deeplinking.js") > -1) {
-                    html = (new String(s.src)).replace(".js", ".html");
-                }
-            }
-            reloader_content.innerHTML = '<iframe id="safarireloader-iframe" src="about:blank" frameborder="no" scrolling="no"></iframe>';
-            document.body.appendChild(reloader_content);
-            reloader_content.style.position = 'absolute';
-            reloader_content.style.left = reloader_content.style.top = '-9999px';
-            iframe = reloader_content.getElementsByTagName('iframe')[0];
-
-			if (document.getElementById("safari_remember_field").value != "" ) {
-				historyHash = document.getElementById("safari_remember_field").value.split(",");
-			}
-
-		}
-
-		if (browser.firefox)
-		{
-			var anchorDiv = document.createElement("div");
-			anchorDiv.id = 'firefox_anchorDiv';
-			document.body.appendChild(anchorDiv);
-		}
-        
-        //setTimeout(checkForUrlChange, 50);
-    }
-
-    return {
-		historyHash: historyHash, 
-        backStack: function() { return backStack; }, 
-        forwardStack: function() { return forwardStack }, 
-        getPlayer: getPlayer, 
-        initialize: function(src) {
-            _initialize(src);
-        }, 
-        setURL: function(url) {
-            document.location.href = url;
-        }, 
-        getURL: function() {
-            return document.location.href;
-        }, 
-        getTitle: function() {
-            return document.title;
-        }, 
-        setTitle: function(title) {
-            try {
-                backStack[backStack.length - 1].title = title;
-            } catch(e) { }
-            
-            document.title = title;
-        }, 
-        setDefaultURL: function(def)
-        {
-            defaultHash = def;
-            def = getHash();
-            //trailing ? is important else an extra frame gets added to the history
-            //when navigating back to the first page.  Alternatively could check
-            //in history frame navigation to compare # and ?.
-			if (browser.ie)
-			{
-                _ie_firstload = true;
-                getHistoryFrame().src = historyFrameSourcePrefix + def;
-                window.location.replace("#" + def);
-                setInterval(checkForUrlChange, 50);
-			}
-
-			if (browser.safari)
-			{
-                currentHistoryLength = history.length;
-                if (historyHash.length == 0) {
-                    historyHash[currentHistoryLength] = defaultHash;
-                    var newloc = "#" + def;
-                    window.location.replace(newloc);
-                } else {
-                    //alert(historyHash[historyHash.length-1]);
-                }
-                //setHash(def);
-                setInterval(checkForUrlChange, 50);
-			}
-			
-			
-			if (browser.firefox || browser.opera)
-			{
-                var reg = new RegExp("#" + def + "$");
-                if (window.location.toString().match(reg)) {
-                } else {
-                    var newloc ="#" + def;
-                    window.location.replace(newloc);
-                }
-                setInterval(checkForUrlChange, 50);
-                //setHash(def);
-            }
-        }, 
-
-        /* Set the current browser URL; called from inside BrowserManager to propagate
-         * the application state out to the container.
-         */
-        setBrowserURL: function(flexAppUrl, copyToAddressBar) {
-           //fromIframe = fromIframe || false;
-           //fromFlex = fromFlex || false;
-           //alert("setBrowserURL: " + flexAppUrl);
-           //flexAppUrl = (flexAppUrl == "") ? defaultHash : flexAppUrl ;
-
-           var pos = document.location.href.indexOf('#');
-           var baseUrl = pos != -1 ? document.location.href.substr(0, pos) : document.location.href;
-           var newUrl = baseUrl + '#' + flexAppUrl;
-
-           if (document.location.href != newUrl && document.location.href + '#' != newUrl) {
-               currentHref = newUrl;
-               addHistoryEntry(baseUrl, newUrl, flexAppUrl, copyToAddressBar);
-               currentHistoryLength = history.length;
-           }
-
-           return false;
-        } 
-
-    }
-
-})();
-
-// Initialization
-
-// Automated unit testing and other diagnostics
-
-function setURL(url)
-{
-    document.location.href = url;
-}
-
-function backButton()
-{
-    history.back();
-}
-
-function forwardButton()
-{
-    history.forward();
-}
-
-function goForwardOrBackInHistory(step)
-{
-    history.go(step);
-}
-
-DeepLinkingUtils.addEvent(window, "load", function() { DeepLinking.initialize(); });
diff --git a/grade/report/visual/flare_visualization/flare/flare.demos/html-template/deeplinking/historyFrame.html b/grade/report/visual/flare_visualization/flare/flare.demos/html-template/deeplinking/historyFrame.html
deleted file mode 100644
index 55788e05d8..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.demos/html-template/deeplinking/historyFrame.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<html>
-    <head>
-        <META HTTP-EQUIV="Pragma" CONTENT="no-cache"> 
-        <META HTTP-EQUIV="Expires" CONTENT="-1"> 
-    </head>
-    <body>
-    <script>
-        function processUrl()
-        {
-
-            var pos = url.indexOf("?");
-            url = pos != -1 ? url.substr(pos + 1) : "";
-            if (!parent._ie_firstload) {
-                parent.DeepLinking.setBrowserURL(url, true);
-                try {
-                    parent.DeepLinking.getPlayer().browserURLChange(url);
-                } catch(e) { }
-            } else {
-                parent._ie_firstload = false;
-            }
-        }
-
-        var url = document.location.href;
-        processUrl();
-        document.write(url);
-    </script>
-    Yo, I'm your history.
-    </body>
-</html>
diff --git a/grade/report/visual/flare_visualization/flare/flare.demos/html-template/index.template.html b/grade/report/visual/flare_visualization/flare/flare.demos/html-template/index.template.html
deleted file mode 100644
index 30cd93826b..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.demos/html-template/index.template.html
+++ /dev/null
@@ -1,118 +0,0 @@
-<!-- saved from url=(0014)about:internet -->
-<html lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-
-<!--  BEGIN DeepLinking required section -->
-<link rel="stylesheet" type="text/css" href="deeplinking/deeplinking.css" />
-<!--  END DeepLinking required section -->
-
-<title>${title}</title>
-<script src="AC_OETags.js" language="javascript"></script>
-
-<!--  BEGIN DeepLinking required section -->
-<script src="deeplinking/deeplinking.js" language="javascript"></script>
-<!--  END DeepLinking required section -->
-
-<style>
-body { margin: 0px; overflow:hidden }
-</style>
-<script language="JavaScript" type="text/javascript">
-<!--
-// -----------------------------------------------------------------------------
-// Globals
-// Major version of Flash required
-var requiredMajorVersion = ${version_major};
-// Minor version of Flash required
-var requiredMinorVersion = ${version_minor};
-// Minor version of Flash required
-var requiredRevision = ${version_revision};
-// -----------------------------------------------------------------------------
-// -->
-</script>
-</head>
-
-<body scroll="no">
-<center>
-<div style="border: 1px solid #cccccc; width:800; height:550; margin-top:20px;">
-<script language="JavaScript" type="text/javascript">
-<!--
-// Version check for the Flash Player that has the ability to start Player Product Install (6.0r65)
-var hasProductInstall = DetectFlashVer(6, 0, 65);
-
-// Version check based upon the values defined in globals
-var hasRequestedVersion = DetectFlashVer(requiredMajorVersion, requiredMinorVersion, requiredRevision);
-
-
-// Check to see if a player with Flash Product Install is available and the version does not meet the requirements for playback
-if ( hasProductInstall && !hasRequestedVersion ) {
-	// MMdoctitle is the stored document.title value used by the installation process to close the window that started the process
-	// This is necessary in order to close browser windows that are still utilizing the older version of the player after installation has completed
-	// DO NOT MODIFY THE FOLLOWING FOUR LINES
-	// Location visited after installation is complete if installation is required
-	var MMPlayerType = (isIE == true) ? "ActiveX" : "PlugIn";
-	var MMredirectURL = window.location;
-    document.title = document.title.slice(0, 47) + " - Flash Player Installation";
-    var MMdoctitle = document.title;
-
-	AC_FL_RunContent(
-		"src", "playerProductInstall",
-		"FlashVars", "MMredirectURL="+MMredirectURL+'&MMplayerType='+MMPlayerType+'&MMdoctitle='+MMdoctitle+"",
-		"width", "${width}",
-		"height", "${height}",
-		"align", "middle",
-		"id", "${application}",
-		"quality", "high",
-		"bgcolor", "${bgcolor}",
-		"name", "${application}",
-		"allowScriptAccess","sameDomain",
-		"type", "application/x-shockwave-flash",
-		"pluginspage", "http://www.adobe.com/go/getflashplayer"
-	);
-} else if (hasRequestedVersion) {
-	// if we've detected an acceptable version
-	// embed the Flash Content SWF when all tests are passed
-	AC_FL_RunContent(
-			"src", "${swf}",
-			"width", "${width}",
-			"height", "${height}",
-			"align", "middle",
-			"id", "${application}",
-			"quality", "high",
-			"bgcolor", "${bgcolor}",
-			"name", "${application}",
-			"allowScriptAccess","sameDomain",
-			"type", "application/x-shockwave-flash",
-			"pluginspage", "http://www.adobe.com/go/getflashplayer"
-	);
-  } else {  // flash is too old or we can't detect the plugin
-    var alternateContent = 'Alternate HTML content should be placed here. '
-  	+ 'This content requires the Adobe Flash Player. '
-   	+ '<a href=http://www.adobe.com/go/getflash/>Get Flash</a>';
-    document.write(alternateContent);  // insert non-flash content
-  }
-// -->
-</script>
-<noscript>
-  	<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
-			id="${application}" width="${width}" height="${height}"
-			codebase="http://fpdownload.macromedia.com/get/flashplayer/current/swflash.cab">
-			<param name="movie" value="${swf}.swf" />
-			<param name="quality" value="high" />
-			<param name="bgcolor" value="${bgcolor}" />
-			<param name="allowScriptAccess" value="sameDomain" />
-			<embed src="${swf}.swf" quality="high" bgcolor="${bgcolor}"
-				width="${width}" height="${height}" name="${application}" align="middle"
-				play="true"
-				loop="false"
-				quality="high"
-				allowScriptAccess="sameDomain"
-				type="application/x-shockwave-flash"
-				pluginspage="http://www.adobe.com/go/getflashplayer">
-			</embed>
-	</object>
-</noscript>
-</div>
-</center>
-</body>
-</html>
diff --git a/grade/report/visual/flare_visualization/flare/flare.demos/html-template/playerProductInstall.swf b/grade/report/visual/flare_visualization/flare/flare.demos/html-template/playerProductInstall.swf
deleted file mode 100644
index bdc3437856..0000000000
Binary files a/grade/report/visual/flare_visualization/flare/flare.demos/html-template/playerProductInstall.swf and /dev/null differ
diff --git a/grade/report/visual/flare_visualization/flare/flare.flex/.actionScriptProperties b/grade/report/visual/flare_visualization/flare/flare.flex/.actionScriptProperties
deleted file mode 100644
index db0f747c48..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.flex/.actionScriptProperties
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<actionScriptProperties mainApplicationPath="flare_flex.as" version="3">
-  <compiler additionalCompilerArguments="" copyDependentFiles="false" enableModuleDebug="true" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="false" htmlHistoryManagement="false" htmlPlayerVersion="9.0.28" htmlPlayerVersionCheck="true" outputFolderPath="bin" strict="true" useApolloConfig="false" verifyDigests="true" warn="true">
-    <compilerSourcePath/>
-    <libraryPath defaultLinkType="1">
-      <libraryPathEntry kind="4" path=""/>
-      <libraryPathEntry kind="3" linkType="2" path="/flare.vis/bin/flare.vis.swc" useDefaultLinkType="false"/>
-      <libraryPathEntry kind="3" linkType="2" path="/flare.animate/bin/flare.animate.swc" useDefaultLinkType="false"/>
-      <libraryPathEntry kind="3" linkType="2" path="/flare.util/bin/flare.util.swc" useDefaultLinkType="false"/>
-      <libraryPathEntry kind="3" linkType="2" path="/flare.physics/bin/flare.physics.swc" useDefaultLinkType="false"/>
-      <libraryPathEntry kind="3" linkType="2" path="/flare.data/bin/flare.data.swc" useDefaultLinkType="false"/>
-    </libraryPath>
-    <sourceAttachmentPath/>
-  </compiler>
-  <applications>
-    <application path="flare_flex.as"/>
-  </applications>
-  <modules/>
-  <buildCSSFiles/>
-</actionScriptProperties>
diff --git a/grade/report/visual/flare_visualization/flare/flare.flex/.flexLibProperties b/grade/report/visual/flare_visualization/flare/flare.flex/.flexLibProperties
deleted file mode 100644
index 637c88d59c..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.flex/.flexLibProperties
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<flexLibProperties version="1">
-  <includeClasses>
-    <classEntry path="flare.flex.FlareVis"/>
-  </includeClasses>
-  <includeResources/>
-  <namespaceManifests>
-    <namespaceManifestEntry manifest="manifest.xml" namespace="http://flare.prefuse.org/2008/mxml"/>
-  </namespaceManifests>
-</flexLibProperties>
diff --git a/grade/report/visual/flare_visualization/flare/flare.flex/.project b/grade/report/visual/flare_visualization/flare/flare.flex/.project
deleted file mode 100644
index ffc44f2ff0..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.flex/.project
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>flare.flex</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.adobe.flexbuilder.project.flexbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.adobe.flexbuilder.project.flexlibnature</nature>
-		<nature>com.adobe.flexbuilder.project.actionscriptnature</nature>
-	</natures>
-</projectDescription>
diff --git a/grade/report/visual/flare_visualization/flare/flare.flex/.settings/org.eclipse.core.resources.prefs b/grade/report/visual/flare_visualization/flare/flare.flex/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 6bcdee146c..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.flex/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Oct 14 21:28:09 PDT 2007
-eclipse.preferences.version=1
-encoding/<project>=utf-8
diff --git a/grade/report/visual/flare_visualization/flare/flare.flex/bin/flare.flex.swc b/grade/report/visual/flare_visualization/flare/flare.flex/bin/flare.flex.swc
deleted file mode 100644
index f8efa97450..0000000000
Binary files a/grade/report/visual/flare_visualization/flare/flare.flex/bin/flare.flex.swc and /dev/null differ
diff --git a/grade/report/visual/flare_visualization/flare/flare.flex/flare/flex/FlareVis.as b/grade/report/visual/flare_visualization/flare/flare.flex/flare/flex/FlareVis.as
deleted file mode 100644
index b7fb1bb21b..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.flex/flare/flex/FlareVis.as
+++ /dev/null
@@ -1,122 +0,0 @@
-package flare.flex
-{
-	import flare.data.DataSet;
-	import flare.display.DirtySprite;
-	import flare.vis.Visualization;
-	import flare.vis.axis.Axes;
-	import flare.vis.axis.CartesianAxes;
-	import flare.vis.data.Data;
-	
-	import mx.containers.Canvas;
-
-	/**
-	 * Flex component that wraps a Flare visualization instance. This class can
-	 * be used to create Flare visualizations within an MXML file. The
-	 * underlying Flare <code>Visualization</code> instance can always be
-	 * accessed using the <code>visualization</code> property.
-	 */
-	public class FlareVis extends Canvas
-	{
-		private var _vis:Visualization;
-		
-		/** The visualization operators used by this visualization. This
-		 *  should be an array of IOperator instances. */
-		public function set operators(a:Array):void {
-			_vis.operators.list = a;
-			_vis.update();
-		}
-		
-		/** The interactive controls used by this visualization. This
-		 *  should be an array of IControl instances. */
-		public function set controls(a:Array):void {
-			_vis.controls.list = a;
-			_vis.update();
-		}
-		
-		/** Sets the data visualized by this instance. The input value can be
-		 *  an array of data objects, a Data instance, or a DataSet instance.
-		 *  Any existing data will be removed and new NodeSprite instances will
-		 *  be created for each object in the input arrary. */
-		public function set dataSet(d:*):void {
-			var dd:Data;
-			
-			if (d is Data) {
-				dd = Data(d);
-			} else if (d is Array) {
-				dd = Data.fromArray(d as Array);
-			} else if (d is DataSet) {
-				dd = Data.fromDataSet(d as DataSet);
-			} else {
-				throw new Error("Unrecognized data set type: "+d);
-			}
-			_vis.data = dd;
-			_vis.operators.setup();
-			_vis.update();
-		}
-		
-		/** Returns the axes for the backing visualization instance. */
-		public function get axes():Axes { return _vis.axes; }
-		
-		/** Returns the CartesianAxes for the backing visualization instance. */
-		public function get xyAxes():CartesianAxes { return _vis.xyAxes; }
-		
-		/** Returns the backing Flare visualization instance. */
-		public function get visualization():Visualization {
-			return _vis;
-		}
-		
-		public function get visWidth():Number { return _vis.bounds.width; }
-		public function set visWidth(w:Number):void {
-			_vis.bounds.width = w;
-			_vis.update();
-			invalidateSize();
-		}
-		
-		public function get visHeight():Number { return _vis.bounds.height; }
-		public function set visHeight(h:Number):void {
-			_vis.bounds.height = h;
-			_vis.update();
-			invalidateSize();
-		}
-		
-		// --------------------------------------------------------------------
-		
-		private var _margin:int = 10;
-		
-		/**
-		 * Creates a new FlareVis component. By default, a new visualization
-		 * with an empty data set is created.
-		 * @param data the data to visualize. If this value is null, a new
-		 *  empty data instance will be used.
-		 */
-		public function FlareVis(data:Data=null) {
-			this.rawChildren.addChild(
-				_vis = new Visualization(data==null ? new Data() : data)
-			);
-			_vis.x = _margin;
-		}
-		
-		// -- Flex Overrides --------------------------------------------------
-		
-		/** @private */
-		public override function getExplicitOrMeasuredWidth():Number {
-			DirtySprite.renderDirty(); // make sure everything is current
-			var w:Number = _vis.bounds.width;
-			if (_vis.width > w) {
-				// TODO: this is a temporary hack. fix later!
-				_vis.x = _margin + Math.abs(_vis.getBounds(_vis).x);
-				w = _vis.width;
-			}
-			return 2*_margin + Math.max(super.getExplicitOrMeasuredWidth(), w);
-		}
-		
-		/** @private */
-		public override function getExplicitOrMeasuredHeight():Number {
-			DirtySprite.renderDirty(); // make sure everything is current
-			return Math.max(super.getExplicitOrMeasuredHeight(),
-							_vis.bounds.height,
-							_vis.height);
-		}
-		
-	} // end of class FlareVis
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.flex/manifest.xml b/grade/report/visual/flare_visualization/flare/flare.flex/manifest.xml
deleted file mode 100644
index 72eb1b27cb..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.flex/manifest.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" ?>
-<componentPackage>
-  <component id="FlareVis" class="flare.flex.FlareVis" />
-</componentPackage>
diff --git a/grade/report/visual/flare_visualization/flare/flare.physics/.actionScriptProperties b/grade/report/visual/flare_visualization/flare/flare.physics/.actionScriptProperties
deleted file mode 100644
index 6fd00a8569..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.physics/.actionScriptProperties
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<actionScriptProperties mainApplicationPath="flarephysics.as" version="3">
-  <compiler additionalCompilerArguments="" copyDependentFiles="false" enableModuleDebug="true" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="false" htmlHistoryManagement="false" htmlPlayerVersion="9.0.28" htmlPlayerVersionCheck="true" outputFolderPath="bin" strict="true" useApolloConfig="false" verifyDigests="true" warn="true">
-    <compilerSourcePath/>
-    <libraryPath defaultLinkType="1">
-      <libraryPathEntry kind="4" path=""/>
-    </libraryPath>
-    <sourceAttachmentPath/>
-  </compiler>
-  <applications>
-    <application path="flarephysics.as"/>
-  </applications>
-  <modules/>
-  <buildCSSFiles/>
-</actionScriptProperties>
diff --git a/grade/report/visual/flare_visualization/flare/flare.physics/.flexLibProperties b/grade/report/visual/flare_visualization/flare/flare.physics/.flexLibProperties
deleted file mode 100644
index 265915f325..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.physics/.flexLibProperties
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<flexLibProperties version="1">
-  <includeClasses>
-    <classEntry path="flare.physics.IForce"/>
-    <classEntry path="flare.physics.NBodyForce"/>
-    <classEntry path="flare.physics.GravityForce"/>
-    <classEntry path="flare.physics.SpringForce"/>
-    <classEntry path="flare.physics.Particle"/>
-    <classEntry path="flare.physics.DragForce"/>
-    <classEntry path="flare.physics.Spring"/>
-    <classEntry path="flare.physics.Simulation"/>
-  </includeClasses>
-  <includeResources/>
-  <namespaceManifests/>
-</flexLibProperties>
diff --git a/grade/report/visual/flare_visualization/flare/flare.physics/.project b/grade/report/visual/flare_visualization/flare/flare.physics/.project
deleted file mode 100644
index 933fc63ad1..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.physics/.project
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>flare.physics</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.adobe.flexbuilder.project.flexbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.adobe.flexbuilder.project.flexlibnature</nature>
-		<nature>com.adobe.flexbuilder.project.actionscriptnature</nature>
-	</natures>
-</projectDescription>
diff --git a/grade/report/visual/flare_visualization/flare/flare.physics/bin/flare.physics.swc b/grade/report/visual/flare_visualization/flare/flare.physics/bin/flare.physics.swc
deleted file mode 100644
index a7cc363cce..0000000000
Binary files a/grade/report/visual/flare_visualization/flare/flare.physics/bin/flare.physics.swc and /dev/null differ
diff --git a/grade/report/visual/flare_visualization/flare/flare.physics/flare/physics/DragForce.as b/grade/report/visual/flare_visualization/flare/flare.physics/flare/physics/DragForce.as
deleted file mode 100644
index c75d1f051a..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.physics/flare/physics/DragForce.as
+++ /dev/null
@@ -1,40 +0,0 @@
-package flare.physics
-{
-	/**
-	 * Force simulating frictional drag forces (e.g., air resistance). For
-	 * each particle, this force applies a drag based on the particles
-	 * velocity (<code>F = a * v</code>, where a is a drag co-efficient and
-	 * v is the velocity of the particle).
-	 */
-	public class DragForce implements IForce
-	{
-		private var _dc:Number;
-		
-		/** The drag co-efficient. */
-		public function get drag():Number { return _dc; }
-		public function set drag(dc:Number):void { _dc = dc; }
-		
-		/**
-		 * Creates a new DragForce with given drag co-efficient.
-		 * @param dc the drag co-efficient.
-		 */
-		public function DragForce(dc:Number=0.1) {
-			_dc = dc;
-		}
-		
-		/**
-		 * Applies this force to a simulation.
-		 * @param sim the Simulation to apply the force to
-		 */
-		public function apply(sim:Simulation):void
-		{
-			if (_dc == 0) return;
-			for (var i:uint = 0; i<sim.particles.length; ++i) {
-				var p:Particle = sim.particles[i];
-				p.fx -= _dc * p.vx;
-				p.fy -= _dc * p.vy;
-			}
-		}
-		
-	} // end of class DragForce
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.physics/flare/physics/GravityForce.as b/grade/report/visual/flare_visualization/flare/flare.physics/flare/physics/GravityForce.as
deleted file mode 100644
index 28aafcc7a4..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.physics/flare/physics/GravityForce.as
+++ /dev/null
@@ -1,46 +0,0 @@
-package flare.physics
-{
-	/**
-	 * Force simulating a global gravitational pull on Particle instances.
-	 */
-	public class GravityForce implements IForce
-	{
-		private var _gx:Number;
-		private var _gy:Number;
-		
-		/** The gravitational acceleration in the horizontal dimension. */
-		public function get gravityX():Number { return _gx; }
-		public function set gravityX(gx:Number):void { _gx = gx; }
-		
-		/** The gravitational acceleration in the vertical dimension. */
-		public function get gravityY():Number { return _gy; }
-		public function set gravityY(gy:Number):void { _gy = gy; }
-		
-		/**
-		 * Creates a new gravity force with given acceleration values.
-		 * @param gx the gravitational acceleration in the horizontal dimension
-		 * @param gy the gravitational acceleration in the vertical dimension
-		 */
-		public function GravityForce(gx:Number=0, gy:Number=0) {
-			_gx = gx;
-			_gy = gy;
-		}
-		
-		/**
-		 * Applies this force to a simulation.
-		 * @param sim the Simulation to apply the force to
-		 */
-		public function apply(sim:Simulation):void
-		{
-			if (_gx == 0 && _gy == 0) return;
-			
-			var p:Particle;
-			for (var i:uint=0; i<sim.particles.length; ++i) {
-				p = sim.particles[i];
-				p.fx += _gx * p.mass;
-				p.fy += _gy * p.mass;
-			}
-		}
-		
-	} // end of class GravityForce
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.physics/flare/physics/IForce.as b/grade/report/visual/flare_visualization/flare/flare.physics/flare/physics/IForce.as
deleted file mode 100644
index 4daab267aa..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.physics/flare/physics/IForce.as
+++ /dev/null
@@ -1,15 +0,0 @@
-package flare.physics
-{
-	/**
-	 * Interface representing a force within a physics simulation.
-	 */
-	public interface IForce
-	{
-		/**
-		 * Applies this force to a simulation.
-		 * @param sim the Simulation to apply the force to
-		 */
-		function apply(sim:Simulation):void;
-		
-	} // end of interface IForce
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.physics/flare/physics/NBodyForce.as b/grade/report/visual/flare_visualization/flare/flare.physics/flare/physics/NBodyForce.as
deleted file mode 100644
index 92def5975d..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.physics/flare/physics/NBodyForce.as
+++ /dev/null
@@ -1,312 +0,0 @@
-package flare.physics
-{
-	/**
-	 * Force simulating an N-Body force of charged particles with pairwise
-	 * interaction, such as gravity or electrical charge. This class uses a
-	 * quad-tree structure to aggregate charge values and optimize computation.
-	 * The force function is a standard inverse-square law (though in this case
-	 * approximated due to optimization): <code>F = G * m1 * m2 / d^2</code>,
-	 * where G is a constant (e.g., gravitational constant), m1 and m2 are the
-	 * masses (charge) of the particles, and d is the distance between them.
-	 * 
-	 * <p>The algorithm used is that of J. Barnes and P. Hut, in their research
-	 * paper <i>A Hierarchical  O(n log n) force calculation algorithm</i>, Nature, 
-	 * v.324, December 1986. For more details on the algorithm, see one of
-	 * the following links:
-	 * <ul>
-	 *   <li><a href="http://www.cs.berkeley.edu/~demmel/cs267/lecture26/lecture26.html">James Demmel's UC Berkeley lecture notes</a>
-	 *   <li><a href="http://www.physics.gmu.edu/~large/lr_forces/desc/bh/bhdesc.html">Description of the Barnes-Hut algorithm</a>
-	 *   <li><a href="http://www.ifa.hawaii.edu/~barnes/treecode/treeguide.html">Joshua Barnes' implementation</a>
-	 * </ul></p>
-	 */
-	public class NBodyForce implements IForce
-	{
-		private var _g:Number;     // gravitational constant
-		private var _t:Number;     // barnes-hut theta
-		private var _max:Number;   // max effective distance
-		private var _min:Number;   // min effective distance
-		private var _eps:Number;   // epsilon for determining 'same' location
-		
-		private var _x1:Number, _y1:Number, _x2:Number, _y2:Number;
-		private var _root:QuadTreeNode;
-		
-		/** The gravitational constant to use. 
-		 *  Negative values produce a repulsive force. */
-		public function get gravitation():Number { return _g; }
-		public function set gravitation(g:Number):void { _g = g; }
-		
-		/** The maximum distance over which forces are exerted. 
-		 *  Any greater distances will be ignored. */
-		public function get maxDistance():Number { return _max; }
-		public function set maxDistance(d:Number):void { _max = d; }
-		
-		/** The minumum effective distance over which forces are exerted.
-		 * 	Any lesser distances will be treated as the minimum. */
-		public function get minDistance():Number { return _min; }
-		public function set minDistance(d:Number):void { _min = d; }
-		
-		// --------------------------------------------------------------------
-		
-		/**
-		 * Creates a new NBodyForce with given parameters.
-		 * @param g the gravitational constant to use.
-		 *  Negative values produce a repulsive force.
-		 * @param maxd a maximum distance over which the force should operate.
-		 *  Particles separated by more than this distance will not interact.
-		 * @param mind the minimum distance over which the force should operate.
-		 *  Particles closer than this distance will interact as if they were
-		 *  the minimum distance apart. This helps avoid extreme forces.
-		 *  Helpful when particles are very close together.
-		 * @param eps an epsilon values for determining a minimum distance
-		 *  between particles
-		 * @param t the theta parameter for the Barnes-Hut approximation.
-		 *  Determines the level of approximation (default value if 0.9).
-		 */
-		public function NBodyForce(g:Number=-1, max:Number=200, min:Number=2,
-								   eps:Number=0.01, t:Number=0.9)
-		{
-			_g = g;
-			_max = max;
-			_min = min;
-			_eps = eps;
-			_t = t;
-			_root = QuadTreeNode.node();
-		}
-
-		/**
-		 * Applies this force to a simulation.
-		 * @param sim the Simulation to apply the force to
-		 */
-		public function apply(sim:Simulation):void
-		{
-			if (_g == 0) return;
-			
-			// clear the quadtree
-			clear(_root); _root = QuadTreeNode.node();
-			
-			// get the tree bounds
-			bounds(sim);
-        
-        	// populate the tree
-        	for (var i:uint = 0; i<sim.particles.length; ++i) {
-        		insert(sim.particles[i], _root, _x1, _y1, _x2, _y2);
-        	}	
-        	
-        	// traverse tree to compute mass
-        	accumulate(_root);
-        	
-        	// calculate forces on each particle
-        	for (i=0; i<sim.particles.length; ++i) {
-        		forces(sim.particles[i], _root, _x1, _y1, _x2, _y2);
-        	}
-		}
-		
-		private function accumulate(n:QuadTreeNode):void {
-			var xc:Number = 0, yc:Number = 0;
-			n.mass = 0;
-			
-			// accumulate childrens' mass
-			var recurse:Function = function(c:QuadTreeNode):void {
-				if (c == null) return;
-				accumulate(c);
-				n.mass += c.mass;
-				xc += c.mass * c.cx;
-				yc += c.mass * c.cy;
-			}
-			if (n.hasChildren) {
-				recurse(n.c1); recurse(n.c2); recurse(n.c3); recurse(n.c4);
-			}
-			
-			// accumulate own mass
-			if (n.p != null) {
-				n.mass += n.p.mass;
-				xc += n.p.mass * n.p.x;
-				yc += n.p.mass * n.p.y;
-			}
-			n.cx = xc / n.mass;
-			n.cy = yc / n.mass;
-		}
-		
-		private function forces(p:Particle, n:QuadTreeNode,
-			x1:Number, y1:Number, x2:Number, y2:Number):void
-		{
-			var f:Number = 0;
-			var dx:Number = n.cx - p.x;
-			var dy:Number = n.cy - p.y;
-			var dd:Number = Math.sqrt(dx*dx + dy*dy);
-			var max:Boolean = _max > 0 && dd > _max;
-			if (dd==0) { // add direction when needed
-				dx = _eps * (0.5-Math.random());
-				dy = _eps * (0.5-Math.random());
-			}
-			
-			// the Barnes-Hut approximation criteria is if the ratio of the
-        	// size of the quadtree box to the distance between the point and
-        	// the box's center of mass is beneath some threshold theta.
-        	if ( (!n.hasChildren && n.p != p) || ((x2-x1)/dd < _t) )
-        	{
-            	if ( max ) return;
-            	// either only 1 particle or we meet criteria
-            	// for Barnes-Hut approximation, so calc force
-            	dd = dd<_min ? _min : dd;
-            	f = _g * p.mass * n.mass / (dd*dd*dd)
-            	p.fx += f*dx; p.fy += f*dy;
-        	}
-        	else if ( n.hasChildren )
-        	{
-            	// recurse for more accurate calculation
-            	var sx:Number = (x1+x2)/2
-            	var sy:Number = (y1+y2)/2;
-            	
-            	if (n.c1) forces(p, n.c1, x1, y1, sx, sy);
-				if (n.c2) forces(p, n.c2, sx, y1, x2, sy);
-				if (n.c3) forces(p, n.c3, x1, sy, sx, y2);
-				if (n.c4) forces(p, n.c4, sx, sy, x2, y2);
-
-            	if ( max ) return;
-            	if ( n.p != null && n.p != p ) {
-            		dd = dd<_min ? _min : dd;
-                	f = _g * p.mass * n.p.mass / (dd*dd*dd);
-                	p.fx += f*dx; p.fy += f*dy;
-            	}
-			}
-		}
-				
-		// -- Helpers ---------------------------------------------------------
-		
-		private function insert(p:Particle, n:QuadTreeNode,
-			x1:Number, y1:Number, x2:Number, y2:Number):void
-		{
-			// try to insert particle p at node n in the quadtree
-        	// by construction, each leaf will contain either 1 or 0 particles
-        	if ( n.hasChildren ) {
-            	// n contains more than 1 particle
-            	insertHelper(p,n,x1,y1,x2,y2);
-        	} else if ( n.p != null ) {
-            	// n contains 1 particle
-            	if ( isSameLocation(n.p, p) ) {
-            		// recurse
-                	insertHelper(p,n,x1,y1,x2,y2);
-            	} else {
-            		// divide
-            		var v:Particle = n.p; n.p = null;
-                	insertHelper(v,n,x1,y1,x2,y2);
-                	insertHelper(p,n,x1,y1,x2,y2);
-            	}
-        	} else { 
-            	// n is empty, add p as leaf
-            	n.p = p;
-        	}
-		}
-		
-		private function insertHelper(p:Particle, n:QuadTreeNode, 
-			x1:Number, y1:Number, x2:Number, y2:Number):void
-    	{
-    		// determine split
-			var sx:Number = (x1+x2)/2;
-			var sy:Number = (y1+y2)/2;
-			var c:uint = (p.x >= sx ? 1 : 0) + (p.y >= sy ? 2 : 0);
-			
-			// update bounds
-			if (c==1 || c==3) x1 = sx; else x2 = sx;
-			if (c>1) y1 = sy; else y2 = sy;
-			
-			// update children
-			var cn:QuadTreeNode;
-			if (c == 0) {
-				if (n.c1==null) n.c1 = QuadTreeNode.node();
-				cn = n.c1;
-			} else if (c == 1) {
-				if (n.c2==null) n.c2 = QuadTreeNode.node();
-				cn = n.c2;
-			} else if (c == 2) {
-				if (n.c3==null) n.c3 = QuadTreeNode.node();
-				cn = n.c3;
-			} else {
-				if (n.c4==null) n.c4 = QuadTreeNode.node();
-				cn = n.c4;
-			}
-			n.hasChildren = true;
-			insert(p,cn,x1,y1,x2,y2);
-    	}
-		
-		private function clear(n:QuadTreeNode):void
-		{
-			if (n.c1 != null) clear(n.c1);
-			if (n.c2 != null) clear(n.c2);
-			if (n.c3 != null) clear(n.c3);
-			if (n.c4 != null) clear(n.c4);
-			QuadTreeNode.reclaim(n);
-		}
-		
-		private function bounds(sim:Simulation):void
-		{
-			var p:Particle, dx:Number, dy:Number;
-			_x1 = _y1 = Number.MAX_VALUE;
-			_x2 = _y2 = Number.MIN_VALUE;
-
-			// get bounding box
-			for (var i:uint = 0; i<sim.particles.length; ++i) {
-				p = sim.particles[i] as Particle;
-				if (p.x < _x1) _x1 = p.x;
-				if (p.y < _y1) _y1 = p.y;
-				if (p.x > _x2) _x2 = p.x;
-				if (p.y > _y2) _y2 = p.y;
-			}
-			
-			// square the box
-			dx = _x2 - _x1;
-			dy = _y2 - _y1;
-			if (dx > dy) {
-				_y2 = _y1 + dx;
-			} else {
-				_x2 = _x1 + dy;
-			}
-		}
-		
-		private function isSameLocation(p1:Particle, p2:Particle):Boolean {
-        	return (Math.abs(p1.x - p2.x) < _eps && 
-        			Math.abs(p1.y - p2.y) < _eps);
-    	}
-		
-	} // end of class NBodyForce
-}
-
-// -- Helper QuadTreeNode class -----------------------------------------------
-
-import flare.physics.Particle;
-
-class QuadTreeNode
-{
-	public var mass:Number = 0;
-	public var cx:Number = 0;
-	public var cy:Number = 0;
-	public var p:Particle = null;
-	public var c1:QuadTreeNode = null;
-	public var c2:QuadTreeNode = null;
-	public var c3:QuadTreeNode = null;
-	public var c4:QuadTreeNode = null;
-	public var hasChildren:Boolean = false;
-	
-	// -- Factory ---------------------------------------------------------
-	
-	private static var _nodes:Array = new Array();
-	
-	public static function node():QuadTreeNode {
-		var n:QuadTreeNode;
-		if (_nodes.length > 0) {
-			n = QuadTreeNode(_nodes.pop());
-		} else {
-			n = new QuadTreeNode();
-		}
-		return n;
-	}
-	
-	public static function reclaim(n:QuadTreeNode):void {
-		n.mass = n.cx = n.cy = 0;
-		n.p = null;
-		n.hasChildren = false;
-		n.c1 = n.c2 = n.c3 = n.c4 = null;
-		_nodes.push(n);
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.physics/flare/physics/Particle.as b/grade/report/visual/flare_visualization/flare/flare.physics/flare/physics/Particle.as
deleted file mode 100644
index 893bea8b90..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.physics/flare/physics/Particle.as
+++ /dev/null
@@ -1,90 +0,0 @@
-package flare.physics
-{
-	/**
-	 * Represents a Particle in a physics simulation. A particle is a 
-	 * point-mass (or point-charge) subject to physical forces.
-	 */
-	public class Particle
-	{
-		/** The mass (or charge) of the particle. */
-		public var mass:Number;
-		/** The number of springs (degree) attached to this particle. */
-		public var degree:Number;
-		/** The x position of the particle. */
-		public var x:Number;
-		/** The y position of the particle. */
-		public var y:Number;
-		/** The x velocity of the particle. */
-		public var vx:Number;
-		/** A temporary x velocity variable. */
-		public var _vx:Number;
-		/** The y velocity of the particle. */
-		public var vy:Number;
-		/** A temporary y velocity variable. */
-		public var _vy:Number;
-		/** The x force exerted on the particle. */
-		public var fx:Number;
-		/** The y force exerted on the particle. */
-		public var fy:Number;
-		/** The age of the particle in simulation ticks. */
-		public var age:Number;
-		/** Flag indicating if the particule should have a fixed position. */
-		public var fixed:Boolean;
-		/** Flag indicating that the particle is scheduled for removal. */
-		public var die:Boolean;
-		/** Tag property for storing an arbitrary value. */
-		public var tag:uint;
-		
-		/**
-		 * Creates a new Particle with given parameters.
-		 * @param mass the mass (or charge) of the particle
-		 * @param x the x position of the particle
-		 * @param y the y position of the particle
-		 * @param vx the x velocity of the particle
-		 * @param vy the y velocity of the particle
-		 * @param fixed flag indicating if the particle should have a 
-		 *  fixed position
-		 */
-		public function Particle(mass:Number=1, x:Number=0, y:Number=0,
-								 vx:Number=0, vy:Number=0, fixed:Boolean=false)
-		{
-			init(mass, x, y, vx, vy, fixed);
-		}
-		
-		/**
-		 * Initializes an existing particle instance.
-		 * @param mass the mass (or charge) of the particle
-		 * @param x the x position of the particle
-		 * @param y the y position of the particle
-		 * @param vx the x velocity of the particle
-		 * @param vy the y velocity of the particle
-		 * @param fixed flag indicating if the particle should have a 
-		 *  fixed position
-		 */
-		public function init(mass:Number=1, x:Number=0, y:Number=0,
-			vx:Number=0, vy:Number=0, fixed:Boolean=false):void
-		{
-			this.mass = mass;
-			this.degree = 0;
-			this.x = x;
-			this.y = y;
-			this.vx = this._vx = vx;
-			this.vy = this._vy = vy;
-			this.fx = 0;
-			this.fy = 0;
-			this.age = 0;
-			this.fixed = fixed;
-			this.die = false;
-			this.tag = 0;
-		}
-		
-		/**
-		 * "Kills" this particle, scheduling it for removal in the next
-		 * simulation cycle.
-		 */
-		public function kill():void {
-			this.die = true;
-		}
-		
-	} // end of class Particle
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.physics/flare/physics/Simulation.as b/grade/report/visual/flare_visualization/flare/flare.physics/flare/physics/Simulation.as
deleted file mode 100644
index 3a97585fa7..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.physics/flare/physics/Simulation.as
+++ /dev/null
@@ -1,342 +0,0 @@
-package flare.physics
-{
-	import flash.geom.Rectangle;
-	
-	/**
-	 * A physical simulation involving particles, springs, and forces.
-	 * Useful for simulating a range of physical effects or layouts.
-	 */
-	public class Simulation
-	{
-		private var _particles:Array = new Array();
-		private var _springs:Array = new Array();
-		private var _forces:Array = new Array();
-		private var _bounds:Rectangle = null;
-		
-		/** The default gravity force for this simulation. */
-		public function get gravityForce():GravityForce {
-			return _forces[0] as GravityForce;
-		}
-		
-		/** The default n-body force for this simulation. */
-		public function get nbodyForce():NBodyForce {
-			return _forces[1] as NBodyForce;
-		}
-		
-		/** The default drag force for this simulation. */
-		public function get dragForce():DragForce {
-			return _forces[2] as DragForce;
-		}
-		
-		/** The default spring force for this simulation. */
-		public function get springForce():SpringForce {
-			return _forces[3] as SpringForce;
-		}
-		
-		/** Sets a bounding box for particles in this simulation.
-		 *  Null (the default) indicates no boundaries. */
-		public function get bounds():Rectangle { return _bounds; }
-		public function set bounds(b:Rectangle):void {
-			if (_bounds == b) return;
-			if (b == null) { _bounds = null; return; }
-			if (_bounds == null) { _bounds = new Rectangle(); }
-			// ensure x is left-most and y is top-most
-			_bounds.x = b.x + (b.width < 0 ? b.width : 0);
-			_bounds.width = (b.width < 0 ? -1 : 1) * b.width;
-			_bounds.y = b.y + (b.width < 0 ? b.height : 0);
-			_bounds.height = (b.height < 0 ? -1 : 1) * b.height;
-		}
-		
-		/**
-		 * Creates a new physics simulation.
-		 * @param gx the gravitational acceleration along the x dimension
-		 * @param gy the gravitational acceleration along the y dimension
-		 * @param drag the default drag (viscosity) co-efficient
-		 * @param attraction the gravitational attraction (or repulsion, for
-		 *  negative values) between particles.
-		 */
-		public function Simulation(gx:Number=0, gy:Number=0,
-			drag:Number=0.1, attraction:Number=-5)
-		{
-			_forces.push(new GravityForce(gx, gy));
-			_forces.push(new NBodyForce(attraction));
-			_forces.push(new DragForce(drag));
-			_forces.push(new SpringForce());
-		}
-		
-		// -- Init Simulation -------------------------------------------------
-		
-		/**
-		 * Adds a custom force to the force simulation.
-		 * @param force the force to add
-		 */
-		public function addForce(force:IForce):void
-		{
-			_forces.push(force);
-		}
-		
-		/**
-		 * Returns the force at the given index.
-		 * @param idx the index of the force to look up
-		 * @return the force at the specified index
-		 */ 
-		public function getForceAt(idx:int):IForce
-		{
-			return _forces[idx];
-		}
-		
-		/**
-		 * Adds a new particle to the simulation.
-		 * @param mass the mass (charge) of the particle
-		 * @param x the particle's starting x position
-		 * @param y the particle's starting y position
-		 * @return the added particle
-		 */
-		public function addParticle(mass:Number, x:Number, y:Number):Particle
-		{
-			var p:Particle = getParticle(mass, x, y);
-			_particles.push(p);
-			return p;
-		}
-		
-		/**
-		 * Removes a particle from the simulation. Any springs attached to
-		 * the particle will also be removed.
-		 * @param idx the index of the particle in the particle list
-		 * @return true if removed, false otherwise.
-		 */
-		public function removeParticle(idx:uint):Boolean
-		{
-			var p:Particle = _particles[idx];
-			if (p == null) return false;
-			
-			// remove springs
-			for (var i:uint = _springs.length; --i >= 0; ) {
-				var s:Spring = _springs[i];
-				if (s.p1 == p || s.p2 == p)
-					removeSpring(i);
-			}
-			// remove from particles
-			reclaimParticle(p);
-			_particles.splice(idx, 1);
-			return true;
-		}
-		
-		/**
-		 * Adds a spring to the simulation
-		 * @param p1 the first particle attached to the spring
-		 * @param p2 the second particle attached to the spring
-		 * @param restLength the rest length of the spring
-		 * @param tension the tension of the spring
-		 * @param damping the damping (friction) co-efficient of the spring
-		 * @return the added spring
-		 */
-		public function addSpring(p1:Particle, p2:Particle, restLength:Number,
-							      tension:Number, damping:Number):Spring
-		{
-			var s:Spring = getSpring(p1, p2, restLength, tension, damping);
-			p1.degree++;
-			p2.degree++;
-			_springs.push(s);
-			return s;
-		}
-		
-		
-		/**
-		 * Removes a spring from the simulation.
-		 * @param idx the index of the spring in the spring list
-		 * @return true if removed, false otherwise
-		 */
-		public function removeSpring(idx:uint):Boolean
-		{
-			if (idx >= _springs.length) return false;
-			var s:Spring = _springs[idx];
-			s.p1.degree--;
-			s.p2.degree--;
-			reclaimSpring(s);
-			_springs.splice(idx, 1);
-			return true;
-		}
-		
-		/**
-		 * Returns the particle list. This is the same array instance backing
-		 * the simulation, so edit the array with caution.
-		 * @return the particle list
-		 */
-		public function get particles():Array {
-			return _particles;
-		}
-		
-		/**
-		 * Returns the spring list. This is the same array instance backing
-		 * the simulation, so edit the array with caution.
-		 * @return the spring list
-		 */
-		public function get springs():Array {
-			return _springs;
-		}
-		
-		// -- Run Simulation --------------------------------------------------
-		
-		/**
-		 * Advance the simulation for the specified time interval.
-		 * @param dt the time interval to step the simulation (default 1)
-		 */
-		public function tick(dt:Number=1):void
-		{	
-			var p:Particle, s:Spring, i:uint, ax:Number, ay:Number;
-			var dt1:Number = dt/2, dt2:Number = dt*dt/2;
-			
-			// remove springs connected to dead particles
-			for (i=_springs.length; --i>=0;) {
-				s = _springs[i];
-				if (s.die || s.p1.die || s.p2.die) {
-					s.p1.degree--;
-					s.p2.degree--;
-					reclaimSpring(s);
-					_springs.splice(i, 1);
-				}
-			}
-			
-			// update particles using Verlet integration
-			for (i=_particles.length; --i>=0;) {
-				p = _particles[i];
-				p.age += dt;
-				if (p.die) { // remove dead particles
-					reclaimParticle(p);
-					_particles.splice(i, 1);
-				} else if (p.fixed) {
-					p.vx = p.vy = 0;
-				} else {
-					ax = p.fx / p.mass; ay = p.fy / p.mass;
-					p.x  += p.vx*dt + ax*dt2;
-					p.y  += p.vy*dt + ay*dt2;
-					p._vx = p.vx + ax*dt1;
-					p._vy = p.vy + ay*dt1;
-				}
-			}
-			// evaluate the forces
-			eval();
-			// update particle velocities
-			for (i=_particles.length; --i>=0;) {
-				p = _particles[i];
-				if (!p.fixed) {
-					ax = dt1 / p.mass;
-					p.vx = p._vx + p.fx * ax;
-					p.vy = p._vy + p.fy * ax;
-				}
-			}
-			
-			// enfore bounds
-			if (_bounds) enforceBounds();
-		}
-		
-		private function enforceBounds():void {
-			var minX:Number = _bounds.x;
-			var maxX:Number = _bounds.x + _bounds.width;
-			var minY:Number = _bounds.y;
-			var maxY:Number = _bounds.y + _bounds.height;
-			
-			for each (var p:Particle in _particles) {
-				if (p.x < minX) {
-					p.x = minX; p.vx = 0;
-				} else if (p.x > maxX) {
-					p.x = maxX; p.vx = 0;
-				}
-				if (p.y < minY) {
-					p.y = minY; p.vy = 0;
-				}
-				else if (p.y > maxY) {
-					p.y = maxY; p.vy = 0;
-				}
-			}
-		}
-		
-		/**
-		 * Evaluates the set of forces in the simulation.
-		 */
-		public function eval():void {
-			var i:uint, p:Particle;
-			// reset forces
-			for (i=_particles.length; --i >= 0; ) {
-				p = _particles[i];
-				p.fx = p.fy = 0;
-			}
-			// collect forces
-			for (i=0; i<_forces.length; ++i) {
-				IForce(_forces[i]).apply(this);
-			}
-		}
-		
-		// -- Particle Pool ---------------------------------------------------
-		
-		/** The maximum number of items stored in a simulation object pool. */
-		public static var objectPoolLimit:int = 5000;
-		protected static var _ppool:Array = new Array();
-		protected static var _spool:Array = new Array();
-		
-		/**
-		 * Returns a particle instance, pulling a recycled particle from the
-		 * object pool if available.
-		 * @param mass the mass (charge) of the particle
-		 * @param x the particle's starting x position
-		 * @param y the particle's starting y position
-		 * @return a particle instance
-		 */
-		protected static function getParticle(mass:Number, x:Number, y:Number):Particle
-		{
-			if (_ppool.length > 0) {
-				var p:Particle = _ppool.pop();
-				p.init(mass, x, y);
-				return p;
-			} else {
-				return new Particle(mass, x, y);
-			}
-		}
-		
-		/**
-		 * Returns a spring instance, pulling a recycled spring from the
-		 * object pool if available.
-		 * @param p1 the first particle attached to the spring
-		 * @param p2 the second particle attached to the spring
-		 * @param restLength the rest length of the spring
-		 * @param tension the tension of the spring
-		 * @param damping the damping (friction) co-efficient of the spring
-		 * @return a spring instance
-		 */
-		protected static function getSpring(p1:Particle, p2:Particle,
-			restLength:Number, tension:Number, damping:Number):Spring
-		{
-			if (_spool.length > 0) {
-				var s:Spring = _spool.pop();
-				s.init(p1, p2, restLength, tension, damping);
-				return s;
-			} else {
-				return new Spring(p1, p2, restLength, tension, damping);
-			}
-		}
-		
-		/**
-		 * Reclaims a particle, adding it to the object pool for recycling
-		 * @param p the particle to reclaim
-		 */
-		protected static function reclaimParticle(p:Particle):void
-		{
-			if (_ppool.length < objectPoolLimit) {
-				_ppool.push(p);
-			}
-		}
-		
-		/**
-		 * Reclaims a spring, adding it to the object pool for recycling
-		 * @param s the spring to reclaim
-		 */
-		protected static function reclaimSpring(s:Spring):void
-		{
-			if (_spool.length < objectPoolLimit) {
-				_spool.push(s);
-			}
-		}
-		
-	} // end of class Simulation
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.physics/flare/physics/Spring.as b/grade/report/visual/flare_visualization/flare/flare.physics/flare/physics/Spring.as
deleted file mode 100644
index 486a97566b..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.physics/flare/physics/Spring.as
+++ /dev/null
@@ -1,68 +0,0 @@
-package flare.physics
-{
-	/**
-	 * Represents a Spring in a physics simulation. A spring connects two
-	 * particles and is defined by the springs rest length, spring tension,
-	 * and damping (friction) co-efficient.
-	 */
-	public class Spring
-	{
-		/** The first particle attached to the spring. */
-		public var p1:Particle;
-		/** The second particle attached to the spring. */
-		public var p2:Particle;
-		/** The rest length of the spring. */
-		public var restLength:Number;
-		/** The tension of the spring. */
-		public var tension:Number;
-		/** The damping (friction) co-efficient of the spring. */
-		public var damping:Number;
-		/** Flag indicating if this spring is enabled. */
-		public var enabled:Boolean;
-		/** Flag indicating that the spring is scheduled for removal. */
-		public var die:Boolean;
-		/** Tag property for storing an arbitrary value. */
-		public var tag:uint;
-		
-		/**
-		 * Creates a new Spring with given parameters.
-		 * @param p1 the first particle attached to the spring
-		 * @param p2 the second particle attached to the spring
-		 * @param restLength the rest length of the spring
-		 * @param tension the tension of the spring
-		 * @param damping the damping (friction) co-efficient of the spring
-		 */
-		public function Spring(p1:Particle, p2:Particle, restLength:Number=10,
-							   tension:Number=0.1, damping:Number=0.1)
-		{
-			init(p1, p2, restLength, tension, damping);
-		}
-		
-		/**
-		 * Initializes an existing spring instance.
-		 * @param p1 the first particle attached to the spring
-		 * @param p2 the second particle attached to the spring
-		 * @param restLength the rest length of the spring
-		 * @param tension the tension of the spring
-		 * @param damping the damping (friction) co-efficient of the spring
-		 */
-		public function init(p1:Particle, p2:Particle, restLength:Number=10,
-							 tension:Number=0.1, damping:Number=0.1):void
-		{
-			this.p1 = p1;
-			this.p2 = p2;
-			this.restLength = restLength;
-			this.tension = tension;
-			this.damping = damping;
-		}
-		
-		/**
-		 * "Kills" this spring, scheduling it for removal in the next
-		 * simulation cycle.
-		 */
-		public function kill():void {
-			this.die = true;
-		}
-		
-	} // end of class Spring
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.physics/flare/physics/SpringForce.as b/grade/report/visual/flare_visualization/flare/flare.physics/flare/physics/SpringForce.as
deleted file mode 100644
index 8144a385b6..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.physics/flare/physics/SpringForce.as
+++ /dev/null
@@ -1,54 +0,0 @@
-package flare.physics
-{
-	/**
-	 * Force simulating a spring force between two particles. This force
-	 * iterates over each <code>Spring</code> instance in a simulation and
-	 * computes the spring force between the attached particles. Spring forces
-	 * are computed using Hooke's Law plus a damping term modeling frictional
-	 * forces in the spring.
-	 * 
-	 * <p>The actual equation is of the form: <code>F = -k*(d - L) + a*d*(v1 - 
-	 * v2)</code>, where k is the spring tension, d is the distance between
-	 * particles, L is the rest length of the string, a is the damping
-	 * co-efficient, and v1 and v2 are the velocities of the particles.</p>
-	 */
-	public class SpringForce implements IForce
-	{		
-		/**
-		 * Applies this force to a simulation.
-		 * @param sim the Simulation to apply the force to
-		 */
-		public function apply(sim:Simulation):void
-		{
-			var s:Spring, p1:Particle, p2:Particle;
-			var dx:Number, dy:Number, dn:Number, dd:Number, k:Number, fx:Number, fy:Number;
-			
-			for (var i:uint=0; i<sim.springs.length; ++i) {
-				s = Spring(sim.springs[i]);
-				p1 = s.p1;
-				p2 = s.p2;				
-				dx = p1.x - p2.x;
-				dy = p1.y - p2.y;
-				dn = Math.sqrt(dx*dx + dy*dy);
-				dd = dn<1 ? 1 : dn;
-				
-				k  = s.tension * (dn - s.restLength);
-				k += s.damping * (dx*(p1.vx-p2.vx) + dy*(p1.vy-p2.vy)) / dd;
-				k /= dd;
-				
-				// provide a random direction when needed
-				if (dn==0) {
-					dx = 0.01 * (0.5-Math.random());
-					dy = 0.01 * (0.5-Math.random());
-				}
-				
-				fx = -k * dx;
-				fy = -k * dy;
-				
-				p1.fx += fx; p1.fy += fy;
-				p2.fx -= fx; p2.fy -= fy;
-			}
-		}
-		
-	} // end of class SpringForce
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/.actionScriptProperties b/grade/report/visual/flare_visualization/flare/flare.query/.actionScriptProperties
deleted file mode 100644
index 1087920c5d..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/.actionScriptProperties
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<actionScriptProperties mainApplicationPath="query.as" version="3">
-  <compiler additionalCompilerArguments="" copyDependentFiles="false" enableModuleDebug="true" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="false" htmlHistoryManagement="false" htmlPlayerVersion="9.0.28" htmlPlayerVersionCheck="true" outputFolderPath="bin" strict="true" useApolloConfig="false" verifyDigests="true" warn="true">
-    <compilerSourcePath/>
-    <libraryPath defaultLinkType="1">
-      <libraryPathEntry kind="4" path=""/>
-      <libraryPathEntry kind="3" linkType="2" path="/flare.util/bin/flare.util.swc" useDefaultLinkType="false"/>
-    </libraryPath>
-    <sourceAttachmentPath/>
-  </compiler>
-  <applications>
-    <application path="query.as"/>
-  </applications>
-  <modules/>
-  <buildCSSFiles/>
-</actionScriptProperties>
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/.flexLibProperties b/grade/report/visual/flare_visualization/flare/flare.query/.flexLibProperties
deleted file mode 100644
index d065b196f9..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/.flexLibProperties
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<flexLibProperties version="1">
-  <includeClasses>
-    <classEntry path="flare.query.Average"/>
-    <classEntry path="flare.query.methods.sub"/>
-    <classEntry path="flare.query.methods.neq"/>
-    <classEntry path="flare.query.Sum"/>
-    <classEntry path="flare.query.StringUtil"/>
-    <classEntry path="flare.query.Expression"/>
-    <classEntry path="flare.query.Variable"/>
-    <classEntry path="flare.query.methods.count"/>
-    <classEntry path="flare.query.methods.max"/>
-    <classEntry path="flare.query.If"/>
-    <classEntry path="flare.query.methods.eq"/>
-    <classEntry path="flare.query.Arithmetic"/>
-    <classEntry path="flare.query.Func"/>
-    <classEntry path="flare.query.methods.lte"/>
-    <classEntry path="flare.query.methods.orderby"/>
-    <classEntry path="flare.query.methods.mod"/>
-    <classEntry path="flare.query.methods.average"/>
-    <classEntry path="flare.query.methods.or"/>
-    <classEntry path="flare.query.Match"/>
-    <classEntry path="flare.query.Comparison"/>
-    <classEntry path="flare.query.methods.div"/>
-    <classEntry path="flare.query.methods.and"/>
-    <classEntry path="flare.query.methods.not"/>
-    <classEntry path="flare.query.methods.min"/>
-    <classEntry path="flare.query.methods.$"/>
-    <classEntry path="flare.query.methods.func"/>
-    <classEntry path="flare.query.Count"/>
-    <classEntry path="flare.query.Variance"/>
-    <classEntry path="flare.query.methods.xor"/>
-    <classEntry path="flare.query.Or"/>
-    <classEntry path="flare.query.Xor"/>
-    <classEntry path="flare.query.methods._"/>
-    <classEntry path="flare.query.methods.lt"/>
-    <classEntry path="flare.query.methods.select"/>
-    <classEntry path="flare.query.methods.variance"/>
-    <classEntry path="flare.query.Distinct"/>
-    <classEntry path="flare.query.methods.range"/>
-    <classEntry path="flare.query.Query"/>
-    <classEntry path="flare.query.Range"/>
-    <classEntry path="flare.query.methods.gt"/>
-    <classEntry path="flare.query.Maximum"/>
-    <classEntry path="flare.query.Literal"/>
-    <classEntry path="flare.query.Not"/>
-    <classEntry path="flare.query.methods.distinct"/>
-    <classEntry path="flare.query.And"/>
-    <classEntry path="flare.query.methods.gte"/>
-    <classEntry path="flare.query.Minimum"/>
-    <classEntry path="flare.query.methods.iff"/>
-    <classEntry path="flare.query.methods.add"/>
-    <classEntry path="flare.query.methods.sum"/>
-    <classEntry path="flare.query.ExpressionIterator"/>
-    <classEntry path="flare.query.methods.where"/>
-    <classEntry path="flare.query.DateUtil"/>
-    <classEntry path="flare.query.methods.mul"/>
-  </includeClasses>
-  <includeResources/>
-  <namespaceManifests/>
-</flexLibProperties>
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/.project b/grade/report/visual/flare_visualization/flare/flare.query/.project
deleted file mode 100644
index 1347699828..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/.project
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>flare.query</name>
-	<comment></comment>
-	<projects>
-		<project>flare.util</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.adobe.flexbuilder.project.flexbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.adobe.flexbuilder.project.flexlibnature</nature>
-		<nature>com.adobe.flexbuilder.project.actionscriptnature</nature>
-	</natures>
-</projectDescription>
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/bin/flare.query.swc b/grade/report/visual/flare_visualization/flare/flare.query/bin/flare.query.swc
deleted file mode 100644
index 759770e8ff..0000000000
Binary files a/grade/report/visual/flare_visualization/flare/flare.query/bin/flare.query.swc and /dev/null differ
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/AggregateExpression.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/AggregateExpression.as
deleted file mode 100644
index 2aad94737c..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/AggregateExpression.as
+++ /dev/null
@@ -1,72 +0,0 @@
-package flare.query
-{
-	/**
-	 * Base class representing an aggregate (group-by) query operator.
-	 */
-	public class AggregateExpression extends Expression
-	{
-		/** The sub-expression to aggregate. */
-		protected var _expr:Expression;
-		
-		/** The sub-expression to aggregate. */
-		public function get input():Expression { return _expr; }
-		public function set input(e:*):void {
-			_expr = Expression.expr(e);
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function get numChildren():int {
-			return 1;
-		}
-		
-		/**
-		 * Creates a new AggregateExpression.
-		 * @param input the sub-expression to aggregate.
-		 */
-		public function AggregateExpression(input:*) {
-			this.input = input;
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function getChildAt(idx:int):Expression
-	    {
-	    	return idx==0 ? _expr : null;
-	    }
-	    
-	    /**
-		 * @inheritDoc
-		 */
-	    public override function setChildAt(idx:int, expr:Expression):Boolean
-	    {
-	    	if (idx == 0) {
-	    		_expr = expr;
-	    		return true;
-	    	}
-	    	return false;
-	    }
-	    
-	    // --------------------------------------------------------------------
-	    
-	    /**
-	     * Resets the aggregation computation.
-	     */ 
-	    public function reset():void
-		{
-			// subclasses override this
-		}
-		
-		/**
-		 * Increments the aggregation computation to include the input value.
-		 * @param value a value to include within the aggregation.
-		 */
-		public function aggregate(value:Object):void
-		{
-			// subclasses override this
-		}
-	    
-	} // end of class AggregateExpression
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/And.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/And.as
deleted file mode 100644
index 9c6212f599..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/And.as
+++ /dev/null
@@ -1,55 +0,0 @@
-package flare.query
-{	
-	/**
-	 * Expression operator that computes the logical "and" of sub-expression
-	 * clauses.
-	 */
-	public class And extends CompositeExpression
-	{
-		/**
-		 * Creates a new And operator.
-		 * @param clauses the sub-expression clauses
-		 */
-		public function And(...clauses) {
-			super(clauses);
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function clone():Expression
-		{
-			return cloneHelper(new And());
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function eval(o:Object=null):Object
-		{
-			return predicate(o);
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function predicate(o:Object):Boolean
-		{
-			if (_children.length==0) return false;
-			
-			for each (var e:Expression in _children) {
-				if (!e.eval(o)) return false;
-			}
-			return true;
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function toString():String
-		{
-			return _children.length==0 ? "FALSE" : super.getString("AND");
-		}
-		
-	} // end of class And
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Arithmetic.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Arithmetic.as
deleted file mode 100644
index 98ac878e20..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Arithmetic.as
+++ /dev/null
@@ -1,132 +0,0 @@
-package flare.query
-{
-	/**
-	 * Expression operator for arithmetic operations. Performs addition,
-	 * subtraction, multiplication, or division of sub-expression values.
-	 */
-	public class Arithmetic extends BinaryExpression
-	{
-		/** Indicates an addition operation. */
-	    public static const ADD:int = 0;
-	    /** Indicates a subtraction operation. */
-	    public static const SUB:int = 1;
-	    /** Indicates a multiplication operation. */
-	    public static const MUL:int = 2;
-	    /** Indicates a division operation. */
-	    public static const DIV:int = 3;
-	    /** Indicates a modulo operation. */
-	    public static const MOD:int = 4;
-		
-		/** Returns a string representation of the arithmetic operator. */
-		public override function get operatorString():String
-		{
-        	switch (_op) {
-	        	case ADD: return '+';
-	        	case SUB: return '-';
-	        	case MUL: return '*';
-	        	case DIV: return '/';
-	        	case MOD: return '%';
-	        	default: return '?';
-	        }
-		}
-		
-		/**
-	     * Create a new Arithmetic expression.
-	     * @param operation the operation to perform
-	     * @param left the left sub-expression
-	     * @param right the right sub-expression
-	     */
-	    public function Arithmetic(op:int, left:*, right:*)
-	    {
-	        super(op, ADD, MOD, left, right);
-	    }
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function clone():Expression
-		{
-			return new Arithmetic(_op, _left.clone(), _right.clone());
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function eval(o:Object=null):Object
-		{
-			var x:Number = Number(_left.eval(o));
-			var y:Number = Number(_right.eval(o));
-			
-	        // compute return value
-	        switch (_op) {
-	        	case ADD: return x+y;
-	        	case SUB: return x-y;
-	        	case MUL: return x*y;
-	        	case DIV: return x/y;
-	        	case MOD: return x%y;
-	        }
-	        throw new Error("Unknown operation type: "+_op);
-		}
-		
-		// -- Static constructors ---------------------------------------------
-		
-		/**
-		 * Creates a new Arithmetic operator for adding two numbers.
-		 * @param left the left-hand input expression
-		 * @param right the right-hand input expression
-		 * @return the new Arithmetic operator
-		 */
-		public static function Add(left:*, right:*):Arithmetic
-		{
-			return new Arithmetic(ADD, left, right);
-		}
-		
-		/**
-		 * Creates a new Arithmetic operator for subtracting one number
-		 *  from another.
-		 * @param left the left-hand input expression
-		 * @param right the right-hand input expression
-		 * @return the new Arithmetic operator
-		 */
-		public static function Subtract(left:*, right:*):Arithmetic
-		{
-			return new Arithmetic(SUB, left, right);
-		}
-		
-		/**
-		 * Creates a new Arithmetic operator for multiplying two numbers.
-		 * @param left the left-hand input expression
-		 * @param right the right-hand input expression
-		 * @return the new Arithmetic operator
-		 */
-		public static function Multiply(left:*, right:*):Arithmetic
-		{
-			return new Arithmetic(MUL, left, right);
-		}
-		
-		/**
-		 * Creates a new Arithmetic operator for dividing one number
-		 *  by another.
-		 * @param left the left-hand input expression
-		 * @param right the right-hand input expression
-		 * @return the new Arithmetic operator
-		 */
-		public static function Divide(left:*, right:*):Arithmetic
-		{
-			return new Arithmetic(DIV, left, right);
-		}
-		
-		/**
-		 * Creates a new Arithmetic operator for computing the modulo
-		 *  (remainder) of a number.
-		 * @param left the left-hand input expression
-		 * @param right the right-hand input expression
-		 * @return the new Arithmetic operator
-		 */
-		public static function Mod(left:*, right:*):Arithmetic
-		{
-			return new Arithmetic(MOD, left, right);
-		}
-		
-	} // end of class Arithmetic
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Average.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Average.as
deleted file mode 100644
index 2928d98a1c..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Average.as
+++ /dev/null
@@ -1,50 +0,0 @@
-package flare.query
-{
-	/**
-	 * Aggregate (group-by) operator for computing the average of a set of
-	 * values.
-	 */
-	public class Average extends AggregateExpression
-	{
-		protected var _sum:Number;
-		protected var _count:Number;
-		
-		/**
-		 * Creates a new Average operator
-		 * @param input the sub-expression of which to compute the average
-		 */
-		public function Average(input:*) {
-			super(input);
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function reset():void
-		{
-			_sum = 0;
-			_count = 0;
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function eval(o:Object=null):Object
-		{
-			return _sum / _count;
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function aggregate(value:Object):void
-		{
-			var x:Number = Number(_expr.eval(value));
-			if (!isNaN(x)) {
-				_sum += x;
-				_count += 1;
-			}
-		}
-		
-	} // end of class Average
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/BinaryExpression.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/BinaryExpression.as
deleted file mode 100644
index 6b9a264f4b..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/BinaryExpression.as
+++ /dev/null
@@ -1,102 +0,0 @@
-package flare.query
-{
-	/**
-	 * Base class for binary expression operators.
-	 */
-	public class BinaryExpression extends Expression
-	{
-		/** Code indicating the operation perfomed by this instance. */
-		protected var _op:int;
-		/** The left-hand-side sub-expression. */
-		protected var _left:Expression;
-		/** The right-hand-side sub-expression. */
-		protected var _right:Expression;
-		
-		/** Code indicating the operation performed by this instance. */
-		public function get operator():int { return _op; }
-		public function set operator(op:int):void { _op = op; }
-		/** String representation of the operation performed by this
-		 *  instance. */
-		public function get operatorString():String { return null; }
-		
-		/** The left-hand-side sub-expression. */
-		public function get left():Expression { return _left; }
-		public function set left(l:*):void {
-			_left = Expression.expr(l);
-		}
-		
-		/** The right-hand-side sub-expression. */
-		public function get right():Expression { return _right; }
-		public function set right(r:*):void {
-			_right = Expression.expr(r);
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function get numChildren():int {
-			return 2;
-		}
-		
-		// --------------------------------------------------------------------
-		
-		/**
-		 * Creates a new BinaryExpression.
-		 * @param op the operation code
-		 * @param minOp the minimum legal operation code
-		 * @param maxOp the maximum legal operation code
-		 * @param left the left-hand-side sub-expression
-		 * @param right the right-hand-side sub-expression
-		 */
-		public function BinaryExpression(op:int, minOp:int, maxOp:int,
-            left:*, right:*)
-	    {
-	        // operation check
-	        if (op < minOp || op > maxOp) {
-	            throw new ArgumentError("Unknown operation type: " + op);
-	        }
-	        // null check
-	        if (left == null || right == null) {
-	            throw new ArgumentError("Expressions must be non-null.");
-	        }
-	        _op = op;
-	        this.left = left;
-	        this.right = right;
-	    }
-	    
-	    /**
-		 * @inheritDoc
-		 */
-	    public override function getChildAt(idx:int):Expression
-	    {
-	    	switch (idx) {
-	    		case 0: return _left;
-	    		case 1: return _right;
-	    		default: return null;
-	    	}
-	    }
-	    
-	    /**
-		 * @inheritDoc
-		 */
-	    public override function setChildAt(idx:int, expr:Expression):Boolean
-	    {
-	    	switch (idx) {
-	    		case 0: _left = expr;  return true;
-	    		case 1: _right = expr; return true;
-	    		default: return false;
-	    	}
-	    }
-	    
-	    /**
-		 * @inheritDoc
-		 */
-	    public override function toString():String
-	    {
-	        return '(' + _left.toString() +' '
-	                   +  operatorString  +' '
-	        		   + _right.toString()+')';
-	    }
-
-	} // end of class BinaryExpression
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Comparison.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Comparison.as
deleted file mode 100644
index 0da8f5668b..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Comparison.as
+++ /dev/null
@@ -1,167 +0,0 @@
-package flare.query
-{
-	/**
-	 * Expression operator for comparing sub-expression values. Performs
-	 * equals, not equals, less-than, greater-than, less-than-or-equal, or
-	 * greater-than-or-equal comparison.
-	 */
-	public class Comparison extends BinaryExpression
-	{
-		/** Indicates a less-than comparison. */
-	    public static const LT:int   = 0;
-    	/** Indicates a greater-than comparison. */
-    	public static const GT:int   = 1;
-    	/** Indicates a equals comparison. */
-    	public static const EQ:int   = 2;
-    	/** Indicates a not-equals comparison. */
-    	public static const NEQ:int  = 3;
-    	/** Indicates a less-than-or-equals comparison. */
-    	public static const LTEQ:int = 4;
-    	/** Indicates a greater-than-or-equals comparison. */
-    	public static const GTEQ:int = 5;
-
-		private var _cmp:Function = null;
-		
-		/** Comparison function for custom ordering criteria. */
-		public function get comparator():Function { return _cmp; }
-		public function set comparator(f:Function):void { _cmp = f; }
-		
-		/** Returns a string representation of the arithmetic operator. */
-		public override function get operatorString():String
-		{
-	        switch (_op) {
-	        	case LT:	return "<";
-	        	case GT:	return ">";
-	        	case EQ:	return "=";
-	        	case NEQ:	return "!=";
-	        	case LTEQ:	return "<=";
-	        	case GTEQ:	return ">=";
-	        	default: 	return "?";
-	        }
-	    }
-		
-		// --------------------------------------------------------------------
-		
-		/**
-		 * Creates a new Comparison operator.
-		 * @param left the left-hand-side sub-expression to compare
-		 * @param right the right-hand-side sub-expression to compare
-		 * @param comparator a function to use for comparison (null by default)
-		 */
-		public function Comparison(op:int, left:*,
-			right:*, comparator:Function=null)
-		{
-			super(op, LT, GTEQ, left, right);
-			_cmp = comparator;
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function clone():Expression
-		{
-			return new Comparison(_op, _left.clone(), _right.clone(), _cmp);
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function eval(o:Object=null):Object
-		{
-			return predicate(o);
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function predicate(o:Object):Boolean
-		{
-			var l:Object = _left.eval(o);
-			var r:Object = _right.eval(o);
-			var c:int = (_cmp != null) ? _cmp(l, r) :
-				(l<r || r&&!1) ? -1 : (l>r || l&&!r) ? 1 : 0;
-			
-	        switch (_op) {
-	        	case LT:	return (c == -1);
-	        	case GT:	return (c == 1);
-	        	case EQ:	return (c == 0);
-	        	case NEQ:	return (c != 0);
-	        	case LTEQ:	return (c <= 0);
-	        	case GTEQ:	return (c >= 0);
-	        	default:
-	            	throw new Error("Unknown operation: "+_op);
-	        }
-		}
-
-		// -- Static Constructors ---------------------------------------------
-		
-		/**
-		 * Creates a new Comparison operator for a less-than comparison.
-		 * @param left the left-hand input expression
-		 * @param right the right-hand input expression
-		 * @return the new Comparison operator
-		 */
-		public static function LessThan(left:*, right:*):Comparison
-		{
-			return new Comparison(LT, left, right);
-		}
-		
-		/**
-		 * Creates a new Comparison operator for a greater-than comparison.
-		 * @param left the left-hand input expression
-		 * @param right the right-hand input expression
-		 * @return the new Comparison operator
-		 */
-		public static function GreaterThan(left:*, right:*):Comparison
-		{
-			return new Comparison(GT, left, right);
-		}
-		
-		/**
-		 * Creates a new Comparison operator for an equals comparison.
-		 * @param left the left-hand input expression
-		 * @param right the right-hand input expression
-		 * @return the new Comparison operator
-		 */
-		public static function Equal(left:*, right:*):Comparison
-		{
-			return new Comparison(EQ, left, right);
-		}
-		
-		/**
-		 * Creates a new Comparison operator for a not equals comparison.
-		 * @param left the left-hand input expression
-		 * @param right the right-hand input expression
-		 * @return the new Comparison operator
-		 */
-		public static function NotEqual(left:*, right:*):Comparison
-		{
-			return new Comparison(NEQ, left, right);
-		}
-		
-		/**
-		 * Creates a new Comparison operator for a less-than-or-equal
-		 * comparison.
-		 * @param left the left-hand input expression
-		 * @param right the right-hand input expression
-		 * @return the new Comparison operator
-		 */
-		public static function LessThanOrEqual(left:*, right:*):Comparison
-		{
-			return new Comparison(LTEQ, left, right);
-		}
-		
-		/**
-		 * Creates a new Comparison operator for a greater-than-or-equal
-		 * comparison.
-		 * @param left the left-hand input expression
-		 * @param right the right-hand input expression
-		 * @return the new Comparison operator
-		 */
-		public static function GreaterThanOrEqual(left:*, right:*):Comparison
-		{
-			return new Comparison(GTEQ, left, right);
-		}
-
-	} // end of class Comparison
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/CompositeExpression.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/CompositeExpression.as
deleted file mode 100644
index 7b33c17f99..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/CompositeExpression.as
+++ /dev/null
@@ -1,148 +0,0 @@
-package flare.query
-{
-	import flash.utils.ByteArray;
-	
-	/**
-	 * Base class for expressions with an arbitrary number of sub-epxressions.
-	 */
-	public class CompositeExpression extends Expression
-	{
-		/** Array of sub-expressions. */
-		protected var _children:Array;
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function get numChildren():int {
-			return _children.length;
-		}
-		
-		/**
-		 * Creates a new CompositeExpression.
-		 * @param items either a single sub-expression or an array of
-		 *  sub-expressions
-		 */
-		public function CompositeExpression(items:Object=null) {
-			if (items is Array) {
-				setChildren(items as Array);
-			} else if (items is Expression) {
-				_children = new Array();
-				addChild(items as Expression);
-			} else if (items == null) {
-				_children = new Array();
-			} else {
-				throw new ArgumentError(
-					"Input must be an expression or array of expressions");
-			}
-		}
-		
-		/**
-		 * Helper routine that clones this composite's sub-expressions.
-		 * @param ce the cloned composite expression
-		 * @return the input expression
-		 */
-		protected function cloneHelper(ce:CompositeExpression):Expression
-		{
-			for (var i:int=0; i<_children.length; ++i) {
-				ce.addChild(Expression(_children[i]).clone());
-			}
-			return ce;
-		}
-		
-		/**
-		 * Sets the sub-expressions of this composite
-		 * @param array an array of sub-expressions
-		 */
-		public function setChildren(array:Array):void
-		{
-			_children = new Array();
-			for each (var e:* in array) {
-				_children.push(Expression.expr(e));
-			}
-		}
-		
-		/**
-		 * Adds an additional sub-expression to this composite.
-		 * @param expr the sub-expression to add.
-		 */
-		public function addChild(expr:Expression):void
-		{
-			_children.push(expr);
-		}
-		
-		/**
-		 * Removes a sub-expression from this composite.
-		 * @param expr the sub-epxressions to remove
-		 * @return true if the expression was found and removed, false
-		 *  otherwise
-		 */
-		public function removeChild(expr:Expression):Boolean
-		{
-			var idx:int = _children.indexOf(expr);
-			if (idx >= 0) {
-				_children.splice(idx, 1);
-				return true;
-			} else {
-				return false;
-			}
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function getChildAt(idx:int):Expression
-		{
-			return _children[idx];
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function setChildAt(idx:int, expr:Expression):Boolean
-		{
-			if (idx>=0 && idx<_children.length) {
-				_children[idx] = expr;
-				return true;
-			}
-			return false;
-		}
-		
-		/**
-		 * Removes all sub-expressions from this composite.
-		 */
-		public function removeAllChildren():void
-		{
-			while (_children.length > 0) _children.pop();
-		}
-		
-		/**
-		 * Returns a string representation of this composite's sub-expressions.
-		 * @param op a string describing the sub-class operator (null by
-		 *  default). If non-null, the operator string will be interspersed
-		 *  between sub-expression values in the output string.
-		 * @return the requested string
-		 */
-		protected function getString(op:String=null):String
-		{	        
-	        var b:ByteArray = new ByteArray();
-	        b.writeUTFBytes('(');
-			for (var i:uint=0; i<_children.length; ++i) {
-				if (i > 0) {
-					if (op == null) {
-						b.writeUTFBytes(', ');
-					} else {
-						b.writeUTFBytes(' ');
-						b.writeUTFBytes(op);
-						b.writeUTFBytes(' ');
-					}
-				}
-				b.writeUTFBytes(_children[i].toString());
-			}
-			b.writeUTFBytes(')');	        
-
-			b.position = 0;
-	        return b.readUTFBytes(b.length);
-		}
-		
-	} // end of class CompositeExpression
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Count.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Count.as
deleted file mode 100644
index f5776ebd04..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Count.as
+++ /dev/null
@@ -1,46 +0,0 @@
-package flare.query
-{
-	/**
-	 * Aggregate (group-by) operator for counting the number of items in a set
-	 * of values.
-	 */
-	public class Count extends AggregateExpression
-	{
-		private var _count:int;
-		
-		/**
-		 * Creates a new Count operator
-		 * @param input the sub-expression of which to count the value
-		 */
-		public function Count(input:*) {
-			super(input);
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function reset():void
-		{
-			_count = 0;
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function eval(o:Object=null):Object
-		{
-			return _count;
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function aggregate(value:Object):void
-		{
-			if (_expr.eval(value) != null) {
-				_count++;
-			}
-		}
-		
-	} // end of class Count
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/DateUtil.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/DateUtil.as
deleted file mode 100644
index b07eea8fe0..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/DateUtil.as
+++ /dev/null
@@ -1,124 +0,0 @@
-package flare.query
-{
-	/**
-	 * Utility class providing functions for manipulating <code>Date</code>
-	 * objects. These functions are intended for use by the
-	 * <code>Function</code> operator.
-	 */
-	public class DateUtil
-	{
-
-// ADDDATE()(v4.1.1) 	Add dates
-// ADDTIME()(v4.1.1) 	Add time
-// CONVERT_TZ()(v4.1.3) 	Convert from one timezone to another
-// CURDATE() 	Return the current date
-// CURRENT_DATE(), CURRENT_DATE 	Synonyms for CURDATE()
-// CURRENT_TIME(), CURRENT_TIME 	Synonyms for CURTIME()
-// CURTIME() 	Return the current time
-// DATE_ADD() 	Add two dates
-// DATE_FORMAT() 	Format date as specified
-// DATE_SUB() 	Subtract two dates
-// DATE()(v4.1.1) 	Extract the date part of a date or datetime expression
-// DATEDIFF()(v4.1.1) 	Subtract two dates
-
-// DAYNAME()(v4.1.21) 	Return the name of the weekday
-
-		// DAYOFMONTH() 	Return the day of the month (1-31)
-		// DAY()(v4.1.1) 	Synonym for DAYOFMONTH()
-		public static function day(d:Date):int
-		{
-			return d.date;
-		}
-
-		// DAYOFWEEK() 	Return the weekday index of the argument
-		// WEEKDAY() 	Return the weekday index
-		public static function dayOfWeek(d:Date):int
-		{
-			return d.day;
-		}
-		
-// DAYOFYEAR() 	Return the day of the year (1-366)
-// EXTRACT 	Extract part of a date
-// FROM_DAYS() 	Convert a day number to a date
-// FROM_UNIXTIME() 	Format date as a UNIX timestamp
-// GET_FORMAT()(v4.1.1) 	Return a date format string
-
-		// HOUR() 	Extract the hour
-		public static function hour(d:Date):int
-		{
-			return d.hours;
-		}
-		
-// LAST_DAY(v4.1.1) 	Return the last day of the month for the argument
-// MAKEDATE()(v4.1.1) 	Create a date from the year and day of year
-// MAKETIME(v4.1.1) 	MAKETIME()
-
-		// MICROSECOND()(v4.1.1) 	Return the microseconds from argument
-		public static function microsecond(d:Date):int
-		{
-			return int(1000 * d.time) % 1000000;
-		}
-		
-		// MINUTE() 	Return the minute from the argument
-		public static function minute(d:Date):int
-		{
-			return d.minutes;
-		}
-		
-		// MONTH() 	Return the month from the date passed
-		public static function month(d:Date):int
-		{
-			return d.month;
-		}
-		
-// MONTHNAME()(v4.1.21) 	Return the name of the month
-
-		// NOW() 	Return the current date and time
-		// LOCALTIME(), LOCALTIME 	Synonym for NOW()
-		// LOCALTIMESTAMP, LOCALTIMESTAMP()(v4.0.6) 	Synonym for NOW()
-		// CURRENT_TIMESTAMP(), CURRENT_TIMESTAMP 	Synonyms for NOW()
-		public static function now():Date
-		{
-			return new Date();
-		}
-
-// PERIOD_ADD() 	Add a period to a year-month
-// PERIOD_DIFF() 	Return the number of months between periods
-// QUARTER() 	Return the quarter from a date argument
-// SEC_TO_TIME() 	Converts seconds to 'HH:MM:SS' format
-
-		// SECOND() 	Return the second (0-59)
-		public static function second(d:Date):int
-		{
-			return d.seconds;
-		}
-
-// STR_TO_DATE()(v4.1.1) 	Convert a string to a date
-// SUBDATE() 	When invoked with three arguments a synonym for DATE_SUB()
-// SUBTIME()(v4.1.1) 	Subtract times
-// SYSDATE() 	Return the time at which the function executes
-// TIME_FORMAT() 	Format as time
-// TIME_TO_SEC() 	Return the argument converted to seconds
-// TIME()(v4.1.1) 	Extract the time portion of the expression passed
-// TIMEDIFF()(v4.1.1) 	Subtract time
-// TIMESTAMP()(v4.1.1) 	With a single argument, this function returns the date or datetime expression. With two arguments, the sum of the arguments
-// TIMESTAMPADD()(v5.0.0) 	Add an interval to a datetime expression
-// TIMESTAMPDIFF()(v5.0.0) 	Subtract an interval from a datetime expression
-// TO_DAYS() 	Return the date argument converted to days
-// UNIX_TIMESTAMP() 	Return a UNIX timestamp
-// TC_DATE()(v4.1.1) 	Return the current UTC date
-// UTC_TIME()(v4.1.1) 	Return the current UTC time
-// UTC_TIMESTAMP()(v4.1.1) 	Return the current UTC date and time
-// WEEK() 	Return the week number
-// WEEKOFYEAR()(v4.1.1) 	Return the calendar week of the date (1-53)
-
-		// YEAR() 	Return the year
-		public static function year(d:Date):int
-		{
-			return d.fullYear;
-		}
-		
-// YEARWEEK() 	Return the year and week
-
-	} // end of class DateUtil
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Distinct.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Distinct.as
deleted file mode 100644
index 254ee2c5ec..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Distinct.as
+++ /dev/null
@@ -1,51 +0,0 @@
-package flare.query
-{
-	/**
-	 * Aggregate (group-by) operator for counting the number of distinct
-	 * values in a set of values.
-	 */
-	public class Distinct extends AggregateExpression
-	{
-		private var _map:Object;
-		private var _count:int;
-		
-		/**
-		 * Creates a new Distinct operator
-		 * @param input the sub-expression of which to compute the distinct
-		 *  values
-		 */
-		public function Distinct(input:*) {
-			super(input);
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function reset():void
-		{
-			_map = {};
-			_count = 0;
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function eval(o:Object=null):Object
-		{
-			return _count;
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function aggregate(value:Object):void
-		{
-			value = _expr.eval(value);
-			if (_map[value] == undefined) {
-				_count++;
-				_map[value] = 1;
-			}
-		}
-		
-	} // end of class Distinct
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Expression.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Expression.as
deleted file mode 100644
index 1bc53786a3..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Expression.as
+++ /dev/null
@@ -1,155 +0,0 @@
-package flare.query
-{	
-	/**
-	 * Base class for query expression operators. Expressions are organized
-	 * into a tree of operators that perform data processing or predicate
-	 * testing on input <code>Object</code> instances.
-	 */
-	public class Expression {
-		
-		/**
-		 * Evaluates this expression with the given input object.
-		 * @param o the input object to this expression
-		 * @return the result of evaluating the expression
-		 */
-		public function eval(o:Object=null):Object
-		{
-			return o;
-		}
-		
-		/**
-		 * Boolean predicate that tests the output of evaluating this
-		 * expression. Returns true if the expression evaluates to true, or
-		 * a non-null or non-zero value. Returns false if the expression
-		 * evaluates to false, or a null or zero value.
-		 * @param o the input object to this expression
-		 * @return the Boolean result of evaluating the expression
-		 */
-		public function predicate(o:Object):Boolean
-		{
-			return Boolean(eval(o));
-		}
-		
-		/**
-		 * The number of sub-expressions that are children of this expression.
-		 * @return the number of child expressions.
-		 */
-		public function get numChildren():int
-		{
-			return 0;
-		}
-		
-		/**
-		 * Returns the sub-expression at the given index.
-		 * @param idx the index of the child sub-expression
-		 * @return the requested sub-expression.
-		 */
-		public function getChildAt(idx:int):Expression
-		{
-			return null;
-		}
-		
-		/**
-		 * Set the sub-expression at the given index.
-		 * @param idx the index of the child sub-expression
-		 * @param expr the sub-expression to set
-		 * @return true if the the sub-expression was successfully set,
-		 *  false otherwise
-		 */
-		public function setChildAt(idx:int, expr:Expression):Boolean
-		{
-			return false;
-		}
-		
-		/**
-		 * Returns a string representation of the expression.
-		 * @return this expression as a string value
-		 */
-		public function toString():String
-		{
-			return null;
-		}
-		
-		/**
-		 * Creates a cloned copy of the expression. Recursively clones any
-		 * sub-expressions.
-		 * @return the cloned expression.
-		 */
-		public function clone():Expression
-		{
-			throw new Error("This is an abstract method");
-		}
-		
-		/**
-		 * Sequentially invokes the input function on this expression and all
-		 * sub-expressions. Complete either when all expressions have been
-		 * visited or the input function returns true, thereby signalling an
-		 * early exit.
-		 * @param f the visiting function to invoke on this expression
-		 * @return true if the input function signalled an early exit
-		 */
-		public function visit(f:Function):Boolean
-		{
-			var iter:ExpressionIterator = new ExpressionIterator(this);
-			return visitHelper(iter, f);
-		}
-		
-		private function visitHelper(iter:ExpressionIterator, f:Function):Boolean
-		{
-			if (f(iter.current) as Boolean) return true;
-			if (iter.down() != null)
-			{
-				do {
-					if (visitHelper(iter, f)) return true;
-				} while (iter.next() != null);
-				iter.up();	
-			}
-			return false;
-		}
-		
-		// --------------------------------------------------------------------
-		
-		private static const _LBRACE:Number = "{".charCodeAt(0);
-		private static const _RBRACE:Number = "}".charCodeAt(0);
-		private static const _SQUOTE:Number = "'".charCodeAt(0);
-		private static const _DQUOTE:Number = "\"".charCodeAt(0);
-		
-		/**
-		 * Utility method that maps an input value into an Expression. If the
-		 * input value is already an Expression, it is simply returned. If the
-		 * input value is a String, it is interpreted as either a variable or
-		 * string literal. If the first and last characters of the string are
-		 * single quotes (') or double quotes ("), the characters between the
-		 * quotes will be used as a string Literal. If there are no quotes, or
-		 * if the string is enclosed by curly braces ({}), the string value
-		 * (sans braces) will be used as the property name of a new Variable.
-		 * In all other cases (Numbers, Dates, etc), a new Literal expression
-		 * for the input value is returned.
-		 * @param o the input value
-		 * @return an Expression corresponding to the input value
-		 */
-		public static function expr(o:*):Expression
-		{
-			if (o is Expression) {
-				return o as Expression;
-			} else if (o is String) {
-				var s:String = o as String;
-				var c1:Number = s.charCodeAt(0);
-				var c2:Number = s.charCodeAt(s.length-1);
-				
-				if (c1 == _LBRACE && c2 == _RBRACE) { // braces -> variable
-					return new Variable(s.substr(1, s.length-2));
-				} else if (c1 == _SQUOTE && c2 == _SQUOTE) { // quote -> string
-					return new Literal(s.substr(1, s.length-2));
-				} else if (c1 == _DQUOTE && c2 == _DQUOTE) { // quote -> string
-					return new Literal(s.substr(1, s.length-2));
-				} else { // default -> variable
-					return new Variable(s);
-				}
-			} else {
-				return new Literal(o);
-			}
-		}
-		
-	} // end of class Expression
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/ExpressionIterator.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/ExpressionIterator.as
deleted file mode 100644
index 4090ee183f..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/ExpressionIterator.as
+++ /dev/null
@@ -1,131 +0,0 @@
-package flare.query
-{	
-	/**
-	 * The ExpressionIterator simplifies the process of traversing an
-	 * expression tree.
-	 */
-	public class ExpressionIterator
-	{
-		private var _estack:Array;
-		private var _istack:Array;
-		private var _root:Expression;
-		private var _cur:Expression;
-		private var _idx:int;
-		
-		/** The expression being traversed. */
-		public function get expression():Expression { return _root; }
-		public function set expression(expr:Expression):void {
-			_root = expr; reset();
-		}
-		/** The parent expression of the iterator's current position. */
-		public function get parent():Expression { return _estack[_estack.length-1]; }
-		/** The expression at this iterator's current position. */
-		public function get current():Expression { return _cur; }
-		/** The depth of this iterator's current position in the
-		 *  expression tree. */
-		public function get depth():int { return _estack.length; }
-		/** An array of expressions from the root expression down to this
-		 *  iterator's current position. */
-		public function get path():Array {
-			var a:Array = new Array(_estack.length);
-			for (var i:int=0; i<a.length; ++i) { a[i] = _estack[i]; }
-			a.push(_cur);
-			return a;
-		}
-		
-		/**
-		 * Creates a new ExpressionIterator.
-		 * @param expr the expression to iterate over
-		 */
-		public function ExpressionIterator(expr:Expression=null) {
-			expression = expr;
-		}
-		
-		/**
-		 * Resets this iterator to the root of the expression tree.
-		 */
-		public function reset():void
-		{
-			_estack = new Array();
-			_istack = new Array();
-			_cur = _root;
-			_idx = 0;
-		}
-		
-		/**
-		 * Moves the iterator one level up the expression tree.
-		 * @return the new current expression, or null if the iterator
-		 *  could not move any further up the tree
-		 */
-		public function up():Expression
-		{
-			if (_cur != _root) {
-				_cur = _estack.pop();
-				_idx = _istack.pop();
-				return _cur;
-			} else {
-				return null;
-			}
-		}
-		
-		/**
-		 * Moves the iterator one level down the expression tree. By default,
-		 * the iterator moves to the left-most child of the previous position.
-		 * @param idx the index of the child expression this iterator should
-		 *  move down to
-		 * @return the new current expression, or null if the iterator
-		 *  could not move any further down the tree
-		 */
-		public function down(idx:int=0):Expression
-		{
-			if (idx >= 0 && _cur.numChildren > idx) {
-				_estack.push(_cur);
-				_istack.push(_idx);
-				_idx = idx;
-				_cur = _cur.getChildAt(_idx);
-				return _cur;
-			} else {
-				return null;
-			}
-		}
-		
-		/**
-		 * Moves the iterator to the next sibling expression in the expression
-		 * tree.
-		 * @return the new current expression, or null if the current position
-		 *  has no next sibling.
-		 */
-		public function next():Expression
-		{
-			if (_estack.length > 0) {
-				var p:Expression = _estack[_estack.length-1];
-				if (p.numChildren > _idx+1) {
-					_idx = _idx + 1;
-					_cur = p.getChildAt(_idx);
-					return _cur;
-				}
-			}
-			return null;
-		}
-		
-		/**
-		 * Moves the iterator to the previous sibling expression in the
-		 * expression tree.
-		 * @return the new current expression, or null if the current position
-		 *  has no previous sibling.
-		 */
-		public function prev():Expression
-		{
-			if (_estack.length > 0) {
-				var p:Expression = _estack[_estack.length-1];
-				if (_idx > 0) {
-					_idx = _idx - 1;
-					_cur = p.getChildAt(_idx);
-					return _cur;
-				}
-			}
-			return null;
-		}
-		
-	} // end of class ExpressionIterator
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Func.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Func.as
deleted file mode 100644
index f8ec3942f4..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Func.as
+++ /dev/null
@@ -1,125 +0,0 @@
-package flare.query
-{	
-	/**
-	 * Expression operator that performs function invocation. The set of
-	 * available functions is determined by a static function table maintained
-	 * by this class. The function table can be extended to introduce custom
-	 * functions into the query language.
-	 */
-	public class Func extends CompositeExpression
-	{
-		private var _name:String;
-		private var _func:Function;
-		private var _args:Array;
-		
-		/**
-		 * Creates a new Func (function) operator.
-		 * @param name the name of the function. This should map to an entry
-		 *  in the static function table.
-		 * @params args sub-expressions for the function arguments
-		 */
-		public function Func(name:String, ...args) {
-			_name = name.toUpperCase();
-			_func = table[_name];
-			super(args);
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function clone():Expression
-		{
-			return new Func(_name, _children);
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function eval(o:Object=null):Object
-		{
-			// first, initialize the argument array as needed
-			if (_args == null || _args.length != _children.length) {
-				_args = new Array(_children.length);
-			}
-			// now evaluate all sub-expressions
-			for (var i:int=0; i<_children.length; ++i) {
-				_args[i] = _children[i].eval(o);
-			}
-			// now evaluate the function
-			return _func.apply(null, _args);
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function toString():String
-		{
-			return _name + getString();
-		}
-		
-		// --------------------------------------------------------------------
-		
-		/** 
-		 * Function table mapping function names to Function instances.
-		 * Functions can be added or removed at run-time by editing this
-		 * object.
-		 */
-		public static var table:Object = {
-			// Math Functions
-			ABS:		Math.abs,
-			ACOS:		Math.acos,
-			ASIN:		Math.asin,
-			ATAN:		Math.atan,
-			ATAN2:		Math.atan2,
-			CEIL:		Math.ceil,
-			CEILING:	Math.ceil,
-			COS:		Math.cos,
-			EXP:		Math.exp,
-			FLOOR:		Math.floor,
-			LOG:		Math.log,
-			MAX:		Math.max,
-			MIN:		Math.min,
-			POW:		Math.pow,
-			POWER:		Math.pow,
-			RANDOM:		Math.random,
-			ROUND:		Math.round,
-			SIN:		Math.sin,
-			SQRT:		Math.sqrt,
-			TAN:		Math.tan,
-			
-			// String Functions
-			CONCAT:		StringUtil.concat,
-			CONCAT_WS:	StringUtil.concat_ws,
-			FORMAT:		StringUtil.format,
-			INSERT:		StringUtil.insert,
-			LEFT:		StringUtil.left,
-			LENGTH:		StringUtil.length,
-			LOWER:		StringUtil.lower,
-			LCASE:		StringUtil.lower,
-			LPAD:		StringUtil.lpad,
-			MID:		StringUtil.substring,
-			POSITION:	StringUtil.position,
-			REVERSE:	StringUtil.reverse,
-			REPEAT:		StringUtil.repeat,
-			REPLACE:	StringUtil.replace,
-			RIGHT:		StringUtil.right,
-			RPAD:		StringUtil.rpad,
-			SPACE:		StringUtil.space,
-			SUBSTRING:	StringUtil.substring,
-			UPPER:		StringUtil.upper,
-			UCASE:		StringUtil.upper,
-			
-			// Date/Time Functions
-			DAY:		DateUtil.day,
-			DAYOFWEEK:	DateUtil.dayOfWeek,
-			HOUR:		DateUtil.hour,
-			MICROSECOND:DateUtil.microsecond,
-			MINUTE:		DateUtil.minute,
-			MONTH:		DateUtil.month,
-			NOW:		DateUtil.now,
-			SECOND:		DateUtil.second,
-			YEAR:		DateUtil.year
-		};
-		
-	} // end of class Func
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/If.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/If.as
deleted file mode 100644
index cb897dffd0..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/If.as
+++ /dev/null
@@ -1,106 +0,0 @@
-package flare.query
-{
-	/**
-	 * Expression operator for an if statement that performs conditional
-	 * execution.
-	 */
-	public class If extends Expression
-	{
-		private var _test:Expression;
-    	private var _then:Expression;
-    	private var _else:Expression;
-	    
-	    /** The conditional clause of the if statement. */
-	    public function get test():Expression { return _test; }
-	    public function set test(e:*):void {
-	    	_test = Expression.expr(e);
-	    }
-	    
-	    /** Sub-expression evaluated if the test condition is true. */
-	    public function get then():Expression { return _then; }
-	    public function set then(e:*):void {
-	    	_then = Expression.expr(e);
-	    }
-	    
-	    /** Sub-expression evaluated if the test condition is false. */
-	    public function get els():Expression { return _else; }
-	    public function set els(e:*):void {
-	    	_else = Expression.expr(e);
-	    }
-	    
-	    /**
-		 * @inheritDoc
-		 */
-	    public override function get numChildren():int { return 3; }
-	    
-	    // --------------------------------------------------------------------
-	    
-	    /**
-	     * Create a new IfExpression.
-	     * @param test the test expression for the if statement
-	     * @param thenExpr the expression to evaluate if the test predicate
-	     * evaluates to true
-	     * @param elseExpr the expression to evaluate if the test predicate
-	     * evaluates to false
-	     */
-	    public function If(test:*, thenExpr:*, elseExpr:*)
-	    {
-	        this.test = test;
-	        this.then = thenExpr;
-	        this.els = elseExpr;
-	    }
-	    
-	    /**
-		 * @inheritDoc
-		 */
-	    public override function clone():Expression
-		{
-			return new If(_test.clone(), _then.clone(), _else.clone());
-		}
-	    
-	    /**
-		 * @inheritDoc
-		 */
-	    public override function eval(o:Object=null):Object
-		{
-			return (_test.predicate(o) ? _then : _else).eval(o);
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function getChildAt(idx:int):Expression
-		{
-			switch (idx) {
-				case 0: return _test;
-				case 1: return _then;
-				case 2: return _else;
-				default: return null;
-			}
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function setChildAt(idx:int, expr:Expression):Boolean
-		{
-			switch (idx) {
-				case 0: _test = expr; return true;
-				case 1: _then = expr; return true;
-				case 2: _else = expr; return true;
-				default: return false;
-			}
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-	    public override function toString():String
-	    {
-	        return "IF " + _test.toString()
-	            + " THEN " + _then.toString()
-	            + " ELSE " + _else.toString();
-	    }
-		
-	} // end of class If
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Literal.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Literal.as
deleted file mode 100644
index 475821b11a..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Literal.as
+++ /dev/null
@@ -1,59 +0,0 @@
-package flare.query
-{	
-	/**
-	 * Expression instance for a literal value.
-	 */
-	public class Literal extends Expression
-	{
-		/** The boolean true literal. */
-		public static const TRUE:Literal = new Literal(true);
-		/** The boolean false literal. */
-		public static const FALSE:Literal = new Literal(false);
-		
-		private var _value:Object = null;
-		
-		/** The literal value of this expression. */
-		public function get value():Object { return _value; }
-		
-		/**
-		 * Creates a new Literal instance.
-		 * @param val the literal value
-		 */
-		public function Literal(val:Object=null) {
-			_value = val;
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function clone():Expression
-		{
-			return new Literal(_value);
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function predicate(o:Object):Boolean
-		{
-			return Boolean(_value);
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function eval(o:Object=null):Object
-		{
-			return _value;
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function toString():String
-		{
-			return String(_value);
-		}
-		
-	} // end of class Literal
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Match.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Match.as
deleted file mode 100644
index ce2e005d4a..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Match.as
+++ /dev/null
@@ -1,127 +0,0 @@
-package flare.query
-{
-	/**
-	 * Expression operator for text matching operations. Performs prefix,
-	 * suffix, containment, and regular expression matching.
-	 */
-	public class Match extends BinaryExpression
-	{
-		/** Indicates a prefix matching test. */
-	    public static const PREFIX:int = 0;
-	    /** Indicates a suffix matching test. */
-	    public static const SUFFIX:int = 1;
-	    /** Indicates a string containment test. */
-	    public static const WITHIN:int = 2;
-	    /** Indicates a regular expression matching test. */
-	    public static const REGEXP:int = 3;
-		
-		/** Returns a string representation of the string matching operator. */
-		public override function get operatorString():String
-		{
-        	switch (_op) {
-	        	case PREFIX: return 'STARTS-WITH';
-	        	case SUFFIX: return 'ENDS-WITH';
-	        	case WITHIN: return 'CONTAINS';
-	        	case REGEXP: return 'REGEXP';
-	        	default: return '?';
-	        }
-		}
-		
-		/**
-	     * Create a new Match expression.
-	     * @param operation the operation to perform
-	     * @param left the left sub-expression
-	     * @param right the right sub-expression
-	     */
-	    public function Match(op:int, left:*, right:*)
-	    {
-	        super(op, PREFIX, REGEXP, left, right);
-	    }
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function clone():Expression
-		{
-			return new Match(_op, _left.clone(), _right.clone());
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function eval(o:Object=null):Object
-		{
-			var s:String = String(_left.eval(o));
-			var p:String = String(_right.eval(o));
-			
-	        // compute return value
-	        switch (_op) {
-	        	case PREFIX: return StringUtil.startsWith(s, p);
-	        	case SUFFIX: return StringUtil.endsWith(s, p);
-	        	case WITHIN: return s.indexOf(p) >= 0;
-	        	case REGEXP: return parseRegExp(p).test(s);
-	        }
-	        throw new Error("Unknown operation type: "+_op);
-		}
-		
-		private var cachedRegExp:RegExp;
-		private var cachedPattern:String;
-		
-		private function parseRegExp(p:String):RegExp
-		{
-			if (p == cachedPattern) return cachedRegExp;
-			
-			cachedPattern = p;
-			var tok:Array = p.split("/");
-			cachedRegExp = new RegExp(tok[1], tok[2]);
-			return cachedRegExp;
-		}
-		
-		// -- Static constructors ---------------------------------------------
-		
-		/**
-		 * Creates a new Match operator for matching string prefix.
-		 * @param left the left-hand input expression
-		 * @param right the right-hand input expression
-		 * @return the new Match operator
-		 */
-		public static function StartsWith(left:*, right:*):Match
-		{
-			return new Match(PREFIX, left, right);
-		}
-		
-		/**
-		 * Creates a new Match operator for matching a string suffix.
-		 * @param left the left-hand input expression
-		 * @param right the right-hand input expression
-		 * @return the new Match operator
-		 */
-		public static function EndsWith(left:*, right:*):Match
-		{
-			return new Match(SUFFIX, left, right);
-		}
-		
-		/**
-		 * Creates a new Match operator for matching string containment.
-		 * @param left the left-hand input expression
-		 * @param right the right-hand input expression
-		 * @return the new Match operator
-		 */
-		public static function Contains(left:*, right:*):Match
-		{
-			return new Match(WITHIN, left, right);
-		}
-		
-		/**
-		 * Creates a new Match operator for matching a regular expression.
-		 * @param left the left-hand input expression
-		 * @param right the right-hand input expression
-		 * @return the new Match operator
-		 */
-		public static function RegEx(left:*, right:*):Match
-		{
-			return new Match(REGEXP, left, right);
-		}
-		
-	} // end of class Match
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Maximum.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Maximum.as
deleted file mode 100644
index 902fce4a33..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Maximum.as
+++ /dev/null
@@ -1,47 +0,0 @@
-package flare.query
-{
-	/**
-	 * Aggregate (group-by) operator for computing the maximum of a set of
-	 * values.
-	 */
-	public class Maximum extends AggregateExpression
-	{
-		private var _value:Object = null;
-		
-		/**
-		 * Creates a new Maximum operator
-		 * @param input the sub-expression of which to compute the maximum
-		 */
-		public function Maximum(input:*) {
-			super(input);
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function eval(o:Object=null):Object
-		{
-			return _value;
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function reset():void
-		{
-			_value = null;
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function aggregate(value:Object):void
-		{
-			value = _expr.eval(value);
-			if (_value == null || value > _value) {
-				_value = value;
-			}
-		}
-		
-	} // end of class Maximum
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Minimum.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Minimum.as
deleted file mode 100644
index a1e08e25d1..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Minimum.as
+++ /dev/null
@@ -1,47 +0,0 @@
-package flare.query
-{
-	/**
-	 * Aggregate (group-by) operator for computing the minimum of a set of
-	 * values.
-	 */
-	public class Minimum extends AggregateExpression
-	{
-		private var _value:Object = null;
-		
-		/**
-		 * Creates a new Minimum operator
-		 * @param input the sub-expression of which to compute the minimum
-		 */
-		public function Minimum(input:*) {
-			super(input);
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function eval(o:Object=null):Object
-		{
-			return _value;
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function reset():void
-		{
-			_value = null;
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function aggregate(value:Object):void
-		{
-			value = _expr.eval(value);
-			if (_value == null || value < _value) {
-				_value = value;
-			}
-		}
-		
-	} // end of class Minimum
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Not.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Not.as
deleted file mode 100644
index d642ce79aa..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Not.as
+++ /dev/null
@@ -1,80 +0,0 @@
-package flare.query
-{	
-	/**
-	 * Expression operator that returns the logical "not" of a sub-expression.
-	 */
-	public class Not extends Expression
-	{
-		private var _clause:Expression;
-		
-		/** The sub-expression clause to negate. */
-		public function get clause():Expression { return _clause; }
-		public function set clause(e:*):void { _clause = Expression.expr(e); }
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function get numChildren():int { return 1; }
-		
-		/**
-		 * Creates a new Not operator.
-		 * @param clause the sub-expression clause to negate
-		 */
-		public function Not(clause:*) {
-			_clause = Expression.expr(clause);
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function clone():Expression
-		{
-			return new Not(_clause.clone());
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function eval(o:Object=null):Object
-		{
-			return predicate(o);
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function predicate(o:Object):Boolean
-		{
-			return !_clause.eval(o);
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function getChildAt(idx:int):Expression
-		{
-			return (idx==0 ? _clause : null);
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function setChildAt(idx:int, expr:Expression):Boolean
-		{
-			if (idx == 0) {
-				_clause = expr;
-				return true;
-			}
-			return false;
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function toString():String
-		{
-			return "NOT " + _clause.toString();
-		}
-		
-	} // end of class Not
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Or.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Or.as
deleted file mode 100644
index 2bca48710d..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Or.as
+++ /dev/null
@@ -1,53 +0,0 @@
-package flare.query
-{
-	/**
-	 * Expression operator that computes the logical "or" of sub-expression
-	 * clauses.
-	 */
-	public class Or extends CompositeExpression
-	{
-		/**
-		 * Creates a new Or operator.
-		 * @param clauses the sub-expression clauses
-		 */
-		public function Or(...clauses) {
-			super(clauses);
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function clone():Expression
-		{
-			return cloneHelper(new Or());
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function eval(o:Object=null):Object
-		{
-			return predicate(o);
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function predicate(o:Object):Boolean
-		{
-			for each (var e:Expression in _children) {
-				if (e.eval(o)) return true;
-			}
-			return false;
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function toString():String
-		{
-			return _children.length==0 ? "FALSE" : super.getString("OR");
-		}
-		
-	} // end of class Or
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Query.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Query.as
deleted file mode 100644
index 403a8870d3..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Query.as
+++ /dev/null
@@ -1,322 +0,0 @@
-package flare.query
-{
-	import flare.util.Property;
-	import flare.util.Sort;
-	
-	/**
-	 * Performs query processing over a collection of ActionScript objects.
-	 * Queries can perform filtering, sorting, grouping, and aggregation
-	 * operations over a data collection. Arbitrary data collections can
-	 * be queried by providing a visitor function similar to the
-	 * <code>Array.forEach<code> method to the query <code>eval</code> method.
-	 * 
-	 * <p>The <code>select</code> and <code>where</code> methods in the
-	 * <code>flare.query.methods</code> package are useful shorthands
-	 * for helping to construct queries in code.</p>
-	 * 
-	 * <p>Here is an example of a query. It uses helper methods defined in the
-	 * <code>flare.query.methods</code> package. For example, the
-	 * <code>sum</code> method creates a <code>Sum</code> query operator and
-	 * the <code>_</code> method creates as a <code>Literal</code> expression
-	 * for its input value.</p>
-	 * 
-	 * <pre>
-	 * import flare.query.methods.*;
-	 * 
-	 * var data:Array = [
-	 *  {cat:"a", val:1}, {cat:"a", val:2}, {cat:"b", val:3}, {cat:"b", val:4},
-	 *  {cat:"c", val:5}, {cat:"c", val:6}, {cat:"d", val:7}, {cat:"d", val:8}
-	 * ];
-	 * 
-	 * var r:Array = select("cat", {sum:sum("val")}) // sum of values
-	 *               .where(neq("cat", _("d"))       // exclude category "d"
-	 *               .groupby("cat")                 // group by category
-	 *               .eval(data);                    // evaluate with data array
-	 * 
-	 * // r == [{cat:"a", sum:3}, {cat:"b", sum:7}, {cat:"c", sum:11}]
-	 * </pre>
-	 */
-	public class Query
-	{
-		private var _select:Array;
-		private var _orderby:Array;
-		private var _groupby:Array;
-		private var _where:Expression;
-		private var _sort:Sort;
-		private var _aggrs:Array;
-		
-		/**
-		 * Creates a new Query.
-		 * @param select an array of select clauses. A select clause consists
-		 *  of either a string representing the name of a variable to query or
-		 *  an object of the form <code>{name:expr}</code>, where
-		 *  <code>name</code> is the name of the query variable to include in
-		 *  query result objects and <code>expr</code> is an Expression for
-		 *  the actual query value. Expressions can be any legal expression, 
-		 *  including aggregate operators.
-		 * @param where a where expression for filtering an object collection
-		 * @param orderby directives for sorting query results, using the
-		 *  format of the <code>flare.util.Sort</code> class methods.
-		 * @param groupby directives for grouping query results, using the
-		 *  format of the <code>flare.util.Sort</code> class methods.
-		 * @see flare.util.Sort
-		 */
-		public function Query(select:Array=null, where:Expression=null,
-							  orderby:Array=null, groupby:Array=null)
-		{
-			if (select != null) setSelect(select);
-			_where = where;
-			_orderby = orderby;
-			_groupby = groupby;
-		}
-		
-		// -- public methods --------------------------------------------------
-		
-		/**
-		 * Sets the select clauses used by this query. A select clause consists
-		 * of either a string representing the name of a variable to query or
-		 * an object of the form <code>{name:expr}</code>, where
-		 * <code>name</code> is the name of the query variable to include in
-		 * query result objects and <code>expr</code> is an Expression for
-		 * the actual query value.
-		 * @param terms a list query terms (select clauses)
-		 * @return this query object
-		 */
-		public function select(...terms):Query
-		{
-			setSelect(terms);
-			return this;
-		}
-		
-		/**
-		 * Sets the where clause (filter conditions) used by this query.
-		 * @param e the filter expression. This can be a string, a literal
-		 *  value, or an <code>Expression</code> instance. This input value
-		 *  will be run through the <code>Expression.expr</code> method.
-		 * @return this query object
-		 */
-		public function where(e:*):Query
-		{
-			_where = Expression.expr(e);
-			return this;
-		}
-				
-		/**
-		 * Sets the sort order for query results.
-		 * @param terms the sort terms as a list of field names to sort on.
-		 *  Each name can optionally be followed by a boolean value indicating
-		 *  if ascending (true) or descending (false) sort order should be
-		 *  used.
-		 * @return this query object
-		 */
-		public function orderby(...terms):Query
-		{
-			_orderby = (terms.length > 0 ? terms : null);
-			return this;
-		}
-		
-		/**
-		 * Sets the group by terms for aggregate queries.
-		 * @param terms an ordered list of terms to group by.
-		 * @return this query object
-		 */
-		public function groupby(...terms):Query
-		{
-			_groupby = (terms.length > 0 ? terms : null);
-			return this;
-		}
-		
-		// -- helper methods --------------------------------------------------
-		
-		private function setSelect(a:Array):void {
-			_select = [];
-			for each (var o:Object in a) {
-				if (o is String) {
-					_select.push({
-						name: o as String,
-						expression: new Variable(o as String)
-					});
-				} else {
-					for (var n:String in o) {
-						_select.push({
-							name: n,
-							expression: Expression.expr(o[n])
-						});
-					}
-				}
-			}
-		}
-		
-		private function sorter():Sort
-		{
-			var s:Array = [], i:int;
-			if (_groupby != null) {
-				for (i=0; i<_groupby.length; ++i)
-					s.push(_groupby[i]);
-			}
-			if (_orderby != null) {
-				for (i=0; i<_orderby.length; ++i)
-					s.push(_orderby[i]);
-			}
-			return s.length==0 ? null : new Sort(s);
-		}
-		
-		private function aggregates():Array
-		{
-			var aggrs:Array = [];
-			for each (var pair:Object in _select) {
-				var expr:Expression = pair.expression;
-				expr.visit(function(e:Expression):void {
-					if (e is AggregateExpression)
-						aggrs.push(e);
-				});
-			}
-			return aggrs.length==0 ? null : aggrs;
-		}
-		
-		// -- query processing ------------------------------------------------
-		
-		/**
-		 * Evaluates this query on an object collection. The input argument can
-		 * either be an array of objects or a visitor function that takes 
-		 * another function as input and applies it to all items in a
-		 * collection.
-		 * @param input either an array of objects or a visitor function
-		 * @return an array of processed query results
-		 */
-		public function eval(input:*):Array
-		{
-			// check for initialization
-			if (_sort  == null) _sort  = sorter();
-			if (_aggrs == null) _aggrs = aggregates();
-			
-			// TODO -- evaluate any sub-queries in WHERE clause
-			var results:Array = [];
-			var visitor:Function;
-			if (input is Array) {
-				visitor = (input as Array).forEach;
-			} else if (input is Function) {
-				visitor = input as Function;
-			} else {
-				throw new ArgumentError("Illegal input argument: "+input);
-			}
-			
-			// collect and filter
-			if (_where != null) {
-				visitor(function(item:Object, ...rest):void {
-					if (_where.predicate(item)) {
-						results.push(item);
-					}
-				});
-			} else {
-				visitor(function(item:Object, ...rest):void {
-					results.push(item);
-				});
-			}
-			
-			// sort the result set
-			if (_sort != null) {
-				_sort.sort(results);
-			}
-			
-			if (_select == null) return results;
-			if (_aggrs == null && _groupby==null) return project(results);
-			return group(results);
-		}
-		
-		/**
-		 * Performs a projection of query results, removing any properties
-		 * not specified by the select clause.
-		 * @param results the filtered query results array
-		 * @return query results array of projected objects
-		 */
-		protected function project(results:Array):Array
-		{			
-			for (var i:int=0; i<results.length; ++i) {
-				var item:Object = {};
-				for each (var pair:Object in _select) {
-					var name:String = pair.name;
-					var expr:Expression = pair.expression;
-					item[name] = expr.eval(results[i]);
-				}
-				results[i] = item;
-			}
-			return results;
-		}
-		
-		// -- group-by and aggregation ----------------------------------------
-		
-		/**
-		 * Performs grouping and aggregation of query results.
-		 * @param items the filtered query results array
-		 * @return aggregated query results array
-		 */
-		protected function group(items:Array):Array
-		{
-			var i:int, item:Object;
-			var results:Array = [], props:Array = [];
-			
-			// get group-by properties as key
-			if (_groupby != null) {
-				for (i=_groupby.length; --i>=0;) {
-					if (_groupby[i] is String) {
-						props.push(Property.$(_groupby[i]));
-					}
-				}
-			}
-			
-			// process all groups
-			reset(_aggrs);
-			for (i=1, item=items[0]; i<=items.length; ++i) {
-				// update the aggregate functions
-				for each (var aggr:AggregateExpression in _aggrs) {
-					aggr.aggregate(items[i-1]);
-				}
-				// handle change of group
-				if (i==items.length || !sameGroup(props, item, items[i])) {
-					results.push(endGroup(item));
-					item = items[i];
-					reset(_aggrs);
-				}
-			}
-			
-			return results;
-		}
-		
-		private function reset(aggrs:Array):void
-		{
-			for each (var aggr:AggregateExpression in aggrs) {
-				aggr.reset();
-			}
-		}
-		
-		private function endGroup(item:Object):Object
-		{
-			var result:Object = {};
-			for each (var pair:Object in _select) {
-				var name:String = pair.name;
-				var expr:Expression = pair.expression;
-				result[name] = expr.eval(item);
-			}
-			return result;
-		}
-		
-		private static function sameGroup(props:Array, x:Object, y:Object):Boolean
-		{
-			var a:*, b:*;
-			for each (var p:Property in props) {
-				a = p.getValue(x);
-				b = p.getValue(y);
-				
-				if (a is Date && b is Date) {
-					if ((a as Date).time != (b as Date).time)
-						return false;
-				} else if (a != b) {
-					return false;
-				}
-			}
-			return true;
-		}
-		
-	} // end of class Query
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Range.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Range.as
deleted file mode 100644
index ccde236b06..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Range.as
+++ /dev/null
@@ -1,51 +0,0 @@
-package flare.query
-{	
-	/**
-	 * Expression operator that tests if a value is within a given range.
-	 * Implemented as an <code>And</code> of <code>Comparison</code>
-	 * expressions.
-	 */
-	public class Range extends And
-	{
-		/** Sub-expression for the minimum value of the range. */
-		public function get min():Expression { return _children[0].left; }
-		public function set min(e:*):void {
-			_children[0].left = Expression.expr(e);
-		}
-		
-		/** Sub-expression for the maximum value of the range. */
-		public function get max():Expression { return _children[1].right; }
-		public function set max(e:*):void {
-			_children[1].right = Expression.expr(e);
-		}
-		
-		/** Sub-expression for the value to test for range inclusion. */
-		public function get val():Expression { return _children[0].right; }
-		public function set val(e:*):void {
-			var expr:Expression = Expression.expr(e);
-			_children[0].right = expr;
-			_children[1].left = expr;
-		}
-		
-		/**
-		 * Create a new Range operator.
-		 * @param min sub-expression for the minimum value of the range
-		 * @param max sub-expression for the maximum value of the range
-		 * @param val sub-expression for the value to test for range inclusion
-		 */
-		public function Range(min:*, max:*, val:*)
-		{
-			addChild(new Comparison(Comparison.LTEQ, min, val));
-			addChild(new Comparison(Comparison.LTEQ, val, max));
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function clone():Expression
-		{
-			return new Range(min.clone(), max.clone(), val.clone());
-		}
-		
-	} // end of class RangePredicate
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/StringUtil.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/StringUtil.as
deleted file mode 100644
index 392af9f778..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/StringUtil.as
+++ /dev/null
@@ -1,161 +0,0 @@
-package flare.query
-{
-	import flash.utils.ByteArray;
-	
-	/**
-	 * Utility class providing functions for manipulating <code>String</code>
-	 * objects. These functions are intended for use by the
-	 * <code>Function</code> operator.
-	 */
-	public class StringUtil
-	{
-		public static function concat(...args):String
-		{
-			return args.join("");
-		}
-		
-		public static function concat_ws(sep:String, ...args):String
-		{
-			return args.join(sep);
-		}
-		
-		public static function format(x:Number, d:int):String
-		{
-			return x.toFixed(d);
-		}
-		
-		public static function insert(s:String, pos:int, len:int, ns:String):String
-		{
-			var slen:int = s.length;
-			if (pos < 0 || pos > slen)
-            	return s;
-	        if (len < 0 || len > slen)
-	            return s.substring(0,pos)+ns;
-	        else
-	            return s.substring(0,pos)+ns+s.substring(len);
-		}
-		
-		public static function left(s:String, len:int):String
-		{
-			return s.substring(0, len);
-		}
-		
-		public static function length(s:String):int
-		{
-			return s.length;
-		}
-		
-		public static function lower(s:String):String
-		{
-			return s.toLowerCase();
-		}
-		
-		public static function lpad(s:String, len:int, pad:String):String
-		{
-			var strlen:int = s.length;
-	        if (strlen > len) {
-	            return s.substring(0,len);
-	        }
-	        else if (strlen == len) {
-	            return s;
-	        }
-	        else {
-	        	var b:ByteArray = new ByteArray();
-	        	var padlen:int = pad.length;
-	        	var diff:int = len - strlen;
-
-	            for (var i:int=0; i<diff; i+=padlen)
-	            	b.writeUTFBytes(pad);
-	            if (b.length > diff)
-	            	b.position = diff;
-	            b.writeUTFBytes(s);
-	            b.position = 0;
-	            return b.readUTFBytes(b.length);
-	        }
-		}
-		
-		public static function position(sub:String, s:String):int
-		{
-			return s.indexOf(sub);
-		}
-		
-		public static function reverse(s:String):String
-		{
-			var b:ByteArray = new ByteArray();
-        	for (var i:int=s.length-1; --i>=0; ) {
-        		b.writeUTFBytes(s.charAt(i));
-        	}
-        	b.position = 0;
-        	return b.readUTFBytes(b.length);
-		}
-		
-		public static function repeat(s:String, count:int):String
-		{
-			var b:ByteArray = new ByteArray();
-        	for (var i:int=0; i<count; ++i) {
-        		b.writeUTFBytes(s);
-        	}
-        	b.position = 0;
-        	return b.readUTFBytes(b.length);
-		}
-		
-		public static function replace(s:String, orig:String, replace:String):String
-		{
-			return s.replace(new RegExp(orig, "g"), replace);
-		}
-		
-		public static function right(s:String, len:int):String
-		{
-			return s.substring(s.length-len);
-		}
-		
-		public static function rpad(s:String, len:int, pad:String):String
-		{
-			var strlen:int = s.length;
-	        if (strlen > len) {
-	            return s.substring(0,len);
-	        }
-	        else if (strlen == len) {
-	            return s;
-	        }
-	        else {
-	        	var b:ByteArray = new ByteArray();
-	        	b.writeUTFBytes(s);
-	        	var padlen:int = pad.length;
-	        	var diff:int = len - strlen;
-
-	            for (var i:int=0; i<diff; i+=padlen)
-	            	b.writeUTFBytes(pad);
-	            b.position = 0;
-	            return b.readUTFBytes(len);
-	        }
-		}
-		
-		public static function space(len:int):String
-		{
-			return repeat(" ", len);
-		}
-		
-		public static function substring(s:String, pos:int, len:int=-1):String
-		{
-			return len>=0 ? s.substr(pos) : s.substr(pos, len);
-		}
-		
-		public static function upper(s:String):String
-		{
-			return s.toUpperCase();
-		}
-		
-		public static function startsWith(s:String, p:String):Boolean
-		{
-			return s.indexOf(p) == 0;
-		}
-		
-		public static function endsWith(s:String, p:String):Boolean
-		{
-			var idx:int = s.indexOf(p);
-			return (idx > 0 && idx == (s.length - p.length));
-		}
-
-	} // end of class StringUtil
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Sum.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Sum.as
deleted file mode 100644
index 5bf7ba0f0b..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Sum.as
+++ /dev/null
@@ -1,47 +0,0 @@
-package flare.query
-{
-	/**
-	 * Aggregate (group-by) operator for computing the sum of a set of
-	 * values.
-	 */
-	public class Sum extends AggregateExpression
-	{
-		private var _sum:Number;
-		
-		/**
-		 * Creates a new Sum operator.
-		 * @param input the sub-expression of which to compute the sum
-		 */
-		public function Sum(input:*) {
-			super(input);
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function reset():void
-		{
-			_sum = 0;
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function eval(o:Object=null):Object
-		{
-			return _sum;
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function aggregate(value:Object):void
-		{
-			var x:Number = Number(_expr.eval(value));
-			if (!isNaN(x)) {
-				_sum += x;
-			}
-		}
-		
-	} // end of class Sum
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Variable.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Variable.as
deleted file mode 100644
index 21a79c8fb8..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Variable.as
+++ /dev/null
@@ -1,54 +0,0 @@
-package flare.query
-{
-	import flare.util.Property;
-	
-	/**
-	 * Expression operator that retrieves a variable value from an object
-	 * property. Uses a <code>flare.util.Property</code> instance to access
-	 * the variable value.
-	 * @see flare.util.Property
-	 */
-	public class Variable extends Expression
-	{
-		private var _prop:Property;
-		
-		/** The name of the variable property. */
-		public function get name():String { return _prop.name; }
-		public function set name(f:String):void {
-			_prop = Property.$(f);
-		}
-		
-		/**
-		 * Creates a new Variable operator.
-		 * @param name the name of the variable property
-		 */
-		public function Variable(name:String) {
-			this.name = name;
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function clone():Expression
-		{
-			return new Variable(_prop.name);
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function eval(o:Object=null):Object
-		{
-			return _prop.getValue(o);
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function toString():String
-		{
-			return "`"+_prop.name+"`";
-		}
-		
-	} // end of class Variable
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Variance.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Variance.as
deleted file mode 100644
index 9939ab0c8f..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Variance.as
+++ /dev/null
@@ -1,71 +0,0 @@
-package flare.query
-{
-	/**
-	 * Aggregate (group-by) operator for computing the variance or
-	 * standard deviation of a set of values.
-	 */
-	public class Variance extends AggregateExpression
-	{
-		/** Flag indicating the population variance or deviation. */
-		public static const POPULATION:int = 0;
-		/** Flag indicating the sample variance or deviation. */
-		public static const SAMPLE:int     = 2;
-		/** Flag indicating the variance should be computed. */
-		public static const VARIANCE:int   = 0;
-		/** Flag indicating the standard deviation should be computed. */
-		public static const DEVIATION:int  = 1;
-		
-		private var _type:int;
-		private var _sum:Number;
-		private var _accum:Number;
-		private var _count:Number;
-		
-		/**
-		 * Creates a new Variance operator. By default, the population variance
-		 * is computed. Use the type flags to change this. For example, the type
-		 * argument <code>Variance.SAMPLE | Variance.DEVIATION</code> results in
-		 * the sample standard deviation being computed.
-		 * @param input the sub-expression of which to compute variance
-		 * @param type the type of variance or deviation to compute
-		 */
-		public function Variance(input:*, type:int=0) {
-			super(input);
-			_type = type;
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function reset():void
-		{
-			_sum = 0;
-			_accum = 0;
-			_count = 0;
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function eval(o:Object=null):Object
-		{
-			var n:Number = _count - (_type & SAMPLE ? 1 : 0);
-			var v:Number = _sum / n;
-			v = v*v + _accum / n;
-			return (_type & DEVIATION ? Math.sqrt(v) : v);
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function aggregate(value:Object):void
-		{
-			var x:Number = Number(_expr.eval(value));
-			if (!isNaN(x)) {
-				_sum += x;
-				_accum += x*x;
-				_count += 1;
-			}
-		}
-		
-	} // end of class Variance
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Xor.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Xor.as
deleted file mode 100644
index a39b1c103e..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/Xor.as
+++ /dev/null
@@ -1,56 +0,0 @@
-package flare.query
-{
-	/**
-	 * Expression operator that computes the exclusive or ("xor") of
-	 * sub-expression clauses.
-	 */
-	public class Xor extends CompositeExpression
-	{
-		/**
-		 * Creates a new Xor operator.
-		 * @param clauses the sub-expression clauses
-		 */
-		public function Xor(...clauses) {
-			super(clauses);
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function clone():Expression
-		{
-			return cloneHelper(new Xor());
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function eval(o:Object=null):Object
-		{
-			return predicate(o);
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function predicate(o:Object):Boolean
-		{
-			if (_children.length == 0) return false;
-			
-			var b:Boolean = _children[0].predicate(o);
-			for (var i:int=1; i<_children.length; ++i) {
-				b = (b != Expression(_children[i]).predicate(o));
-			}
-			return b;
-		}
-		
-		/**
-		 * @inheritDoc
-		 */
-		public override function toString():String
-		{
-			return _children.length==0 ? "FALSE" : super.getString("XOR");
-		}
-		
-	} // end of class Xor
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/$.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/$.as
deleted file mode 100644
index 4c07b477f1..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/$.as
+++ /dev/null
@@ -1,14 +0,0 @@
-package flare.query.methods
-{
-	import flare.query.Variable;
-	
-	/**
-	 * Returns a new Variable expression for the given variable name.
-	 * @param name the variable name to use
-	 * @return the new Variable expression
-	 */
-	public function $(name:String):Variable
-	{
-		return new Variable(name);
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/_.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/_.as
deleted file mode 100644
index 9fc79e417e..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/_.as
+++ /dev/null
@@ -1,14 +0,0 @@
-package flare.query.methods
-{
-	import flare.query.Literal;
-	
-	/**
-	 * Returns a new Literal expression for the input object.
-	 * @param the input object
-	 * @return the new Literal expression
-	 */
-	public function _(a:*):Literal
-	{
-		return new Literal(a);
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/add.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/add.as
deleted file mode 100644
index c8724c96ef..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/add.as
+++ /dev/null
@@ -1,19 +0,0 @@
-package flare.query.methods
-{
-	import flare.query.Arithmetic;
-
-	/**
-	 * Creates a new 'Add' query operator
-	 * @param a the left side argument. 
-	 *  This value can be an expression or a literal value.
-	 *  Literal values are parsed using the Expression.expr method.
-	 * @param b the right side argument
-	 *  This value can be an expression or a literal value.
-	 *  Literal values are parsed using the Expression.expr method.
-	 * @return the new query operator
-	 */
-	public function add(a:*, b:*):Arithmetic
-	{
-		return Arithmetic.Add(a, b);
-	}	
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/and.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/and.as
deleted file mode 100644
index fd38ae1254..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/and.as
+++ /dev/null
@@ -1,16 +0,0 @@
-package flare.query.methods
-{
-	import flare.query.And;
-	
-	/**
-	 * Creates a new 'And' query operator
-	 * @param rest a list of expressions to include in the and
-	 * @return the new query operator
-	 */
-	public function and(...rest):And
-	{
-		var a:And = new And();
-		a.setChildren(rest);
-		return a;
-	}	
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/average.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/average.as
deleted file mode 100644
index cc6cf210fd..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/average.as
+++ /dev/null
@@ -1,14 +0,0 @@
-package flare.query.methods
-{
-	import flare.query.Average;
-	
-	/**
-	 * Creates a new 'Average' aggregate query expression.
-	 * @param expr the input expression
-	 * @return the new query operator
-	 */
-	public function average(expr:*):Average
-	{
-		return new Average(expr);
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/count.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/count.as
deleted file mode 100644
index 2325700dfe..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/count.as
+++ /dev/null
@@ -1,14 +0,0 @@
-package flare.query.methods
-{
-	import flare.query.Count;
-	
-	/**
-	 * Creates a new 'Count' aggregate query expression.
-	 * @param expr the input expression
-	 * @return the new query operator
-	 */
-	public function count(expr:*):Count
-	{
-		return new Count(expr);
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/distinct.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/distinct.as
deleted file mode 100644
index b569b079c7..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/distinct.as
+++ /dev/null
@@ -1,14 +0,0 @@
-package flare.query.methods
-{
-	import flare.query.Distinct;
-	
-	/**
-	 * Creates a new 'Distinct' count aggregate query expression.
-	 * @param expr the input expression
-	 * @return the new query operator
-	 */
-	public function distinct(expr:*):Distinct
-	{
-		return new Distinct(expr);
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/div.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/div.as
deleted file mode 100644
index 3d3470ec76..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/div.as
+++ /dev/null
@@ -1,19 +0,0 @@
-package flare.query.methods
-{
-	import flare.query.Arithmetic;
-
-	/**
-	 * Creates a new 'Divide' query operator
-	 * @param a the left side argument. 
-	 *  This value can be an expression or a literal value.
-	 *  Literal values are parsed using the Expression.expr method.
-	 * @param b the right side argument
-	 *  This value can be an expression or a literal value.
-	 *  Literal values are parsed using the Expression.expr method.
-	 * @return the new query operator
-	 */
-	public function div(a:*, b:*):Arithmetic
-	{
-		return Arithmetic.Divide(a, b);
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/eq.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/eq.as
deleted file mode 100644
index f699984277..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/eq.as
+++ /dev/null
@@ -1,19 +0,0 @@
-package flare.query.methods
-{
-	import flare.query.Comparison;
-	
-		/**
-	 * Creates a new 'Equal' query operator
-	 * @param a the left side argument. 
-	 *  This value can be an expression or a literal value.
-	 *  Literal values are parsed using the Expression.expr method.
-	 * @param b the right side argument
-	 *  This value can be an expression or a literal value.
-	 *  Literal values are parsed using the Expression.expr method.
-	 * @return the new query operator
-	 */
-	public function eq(a:*, b:*):Comparison
-	{
-		return Comparison.Equal(a, b);
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/func.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/func.as
deleted file mode 100644
index f2b0255932..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/func.as
+++ /dev/null
@@ -1,18 +0,0 @@
-package flare.query.methods
-{
-	import flare.query.Func;
-	
-	/**
-	 * Creates a new Func expression for a function in a query.
-	 * @param name the name of the function. This should be a function
-	 *  registered with the Func class.
-	 * @param args a list of arguments to the function
-	 * @return the new Func operator
-	 */
-	public function func(name:String, ...args):Func
-	{
-		var f:Func = new Func(name);
-		f.setChildren(args);
-		return f;
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/gt.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/gt.as
deleted file mode 100644
index f82e55e5c7..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/gt.as
+++ /dev/null
@@ -1,19 +0,0 @@
-package flare.query.methods
-{
-	import flare.query.Comparison;
-
-	/**
-	 * Creates a new 'GreaterThan' query operator
-	 * @param a the left side argument. 
-	 *  This value can be an expression or a literal value.
-	 *  Literal values are parsed using the Expression.expr method.
-	 * @param b the right side argument
-	 *  This value can be an expression or a literal value.
-	 *  Literal values are parsed using the Expression.expr method.
-	 * @return the new query operator
-	 */
-	public function gt(a:*, b:*):Comparison
-	{
-		return Comparison.GreaterThan(a, b);
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/gte.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/gte.as
deleted file mode 100644
index 083b637981..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/gte.as
+++ /dev/null
@@ -1,19 +0,0 @@
-package flare.query.methods
-{
-	import flare.query.Comparison;
-
-	/**
-	 * Creates a new 'GreaterThanOrEqual' query operator
-	 * @param a the left side argument. 
-	 *  This value can be an expression or a literal value.
-	 *  Literal values are parsed using the Expression.expr method.
-	 * @param b the right side argument
-	 *  This value can be an expression or a literal value.
-	 *  Literal values are parsed using the Expression.expr method.
-	 * @return the new query operator
-	 */
-	public function gte(a:*, b:*):Comparison
-	{
-		return Comparison.GreaterThanOrEqual(a, b);
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/iff.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/iff.as
deleted file mode 100644
index 51fa9a9c48..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/iff.as
+++ /dev/null
@@ -1,22 +0,0 @@
-package flare.query.methods
-{
-	import flare.query.If;
-	
-	/**
-	 * Creates a new 'If' query operator
-	 * @param test the if test expression. 
-	 *  This value can be an expression or a literal value.
-	 *  Literal values are parsed using the Expression.expr method.
-	 * @param then the then case expression
-	 *  This value can be an expression or a literal value.
-	 *  Literal values are parsed using the Expression.expr method.
-	 * @param els the else case expression
-	 *  This value can be an expression or a literal value.
-	 *  Literal values are parsed using the Expression.expr method.
-	 * @return the new query operator
-	 */
-	public function iff(test:*, then:*, els:*):If
-	{
-		return new If(test, then, els);
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/lt.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/lt.as
deleted file mode 100644
index 350cc20783..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/lt.as
+++ /dev/null
@@ -1,19 +0,0 @@
-package flare.query.methods
-{
-	import flare.query.Comparison;
-
-	/**
-	 * Creates a new 'LessThan' query operator
-	 * @param a the left side argument. 
-	 *  This value can be an expression or a literal value.
-	 *  Literal values are parsed using the Expression.expr method.
-	 * @param b the right side argument
-	 *  This value can be an expression or a literal value.
-	 *  Literal values are parsed using the Expression.expr method.
-	 * @return the new query operator
-	 */
-	public function lt(a:*, b:*):Comparison
-	{
-		return Comparison.LessThan(a, b);
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/lte.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/lte.as
deleted file mode 100644
index 8b7e3aac2e..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/lte.as
+++ /dev/null
@@ -1,19 +0,0 @@
-package flare.query.methods
-{
-	import flare.query.Comparison;
-
-	/**
-	 * Creates a new 'LessThanOrEqual' query operator
-	 * @param a the left side argument. 
-	 *  This value can be an expression or a literal value.
-	 *  Literal values are parsed using the Expression.expr method.
-	 * @param b the right side argument
-	 *  This value can be an expression or a literal value.
-	 *  Literal values are parsed using the Expression.expr method.
-	 * @return the new query operator
-	 */
-	public function lte(a:*, b:*):Comparison
-	{
-		return Comparison.LessThanOrEqual(a, b);
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/max.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/max.as
deleted file mode 100644
index 128c1d8b6b..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/max.as
+++ /dev/null
@@ -1,14 +0,0 @@
-package flare.query.methods
-{
-	import flare.query.Maximum;
-	
-	/**
-	 * Creates a new 'Maximum' aggregate query expression.
-	 * @param expr the input expression
-	 * @return the new query operator
-	 */
-	public function max(expr:*):Maximum
-	{
-		return new Maximum(expr);
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/min.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/min.as
deleted file mode 100644
index 478d25fcb6..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/min.as
+++ /dev/null
@@ -1,14 +0,0 @@
-package flare.query.methods
-{
-	import flare.query.Minimum;
-	
-	/**
-	 * Creates a new 'Minimum' aggregate query expression.
-	 * @param expr the input expression
-	 * @return the new query operator
-	 */
-	public function min(expr:*):Minimum
-	{
-		return new Minimum(expr);
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/mod.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/mod.as
deleted file mode 100644
index 8f469862e3..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/mod.as
+++ /dev/null
@@ -1,19 +0,0 @@
-package flare.query.methods
-{
-	import flare.query.Arithmetic;
-
-	/**
-	 * Creates a new 'Modulo' query operator
-	 * @param a the left side argument. 
-	 *  This value can be an expression or a literal value.
-	 *  Literal values are parsed using the Expression.expr method.
-	 * @param b the right side argument
-	 *  This value can be an expression or a literal value.
-	 *  Literal values are parsed using the Expression.expr method.
-	 * @return the new query operator
-	 */
-	public function mod(a:*, b:*):Arithmetic
-	{
-		return Arithmetic.Mod(a, b);
-	}	
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/mul.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/mul.as
deleted file mode 100644
index 1cf42489d9..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/mul.as
+++ /dev/null
@@ -1,19 +0,0 @@
-package flare.query.methods
-{
-	import flare.query.Arithmetic;
-
-	/**
-	 * Creates a new 'Multiply' query operator
-	 * @param a the left side argument. 
-	 *  This value can be an expression or a literal value.
-	 *  Literal values are parsed using the Expression.expr method.
-	 * @param b the right side argument
-	 *  This value can be an expression or a literal value.
-	 *  Literal values are parsed using the Expression.expr method.
-	 * @return the new query operator
-	 */
-	public function mul(a:*, b:*):Arithmetic
-	{
-		return Arithmetic.Multiply(a, b);
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/neq.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/neq.as
deleted file mode 100644
index b2deb79a75..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/neq.as
+++ /dev/null
@@ -1,19 +0,0 @@
-package flare.query.methods
-{
-	import flare.query.Comparison;
-
-	/**
-	 * Creates a new 'NotEqual' query operator
-	 * @param a the left side argument. 
-	 *  This value can be an expression or a literal value.
-	 *  Literal values are parsed using the Expression.expr method.
-	 * @param b the right side argument
-	 *  This value can be an expression or a literal value.
-	 *  Literal values are parsed using the Expression.expr method.
-	 * @return the new query operator
-	 */
-	public function neq(a:*, b:*):Comparison
-	{
-		return Comparison.NotEqual(a, b);
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/not.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/not.as
deleted file mode 100644
index 8ad3ab0238..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/not.as
+++ /dev/null
@@ -1,16 +0,0 @@
-package flare.query.methods
-{
-	import flare.query.Not;
-
-	/**
-	 * Creates a new 'Not' query operator
-	 * @param x the expression to negate
-	 *  This value can be an expression or a literal value.
-	 *  Literal values are parsed using the Expression.expr method.
-	 * @return the new query operator
-	 */
-	public function not(x:*):Not
-	{
-		return new Not(x);
-	}	
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/or.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/or.as
deleted file mode 100644
index 093036c51f..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/or.as
+++ /dev/null
@@ -1,16 +0,0 @@
-package flare.query.methods
-{
-	import flare.query.Or;
-	
-	/**
-	 * Creates a new 'Or' query operator
-	 * @param rest a list of expressions to include in the or
-	 * @return the new query operator
-	 */
-	public function or(...rest):Or
-	{
-		var o:Or = new Or();
-		o.setChildren(rest);
-		return o;
-	}	
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/orderby.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/orderby.as
deleted file mode 100644
index 05e1aea049..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/orderby.as
+++ /dev/null
@@ -1,14 +0,0 @@
-package flare.query.methods
-{
-	import flare.query.Query;
-	
-	/**
-	 * Create a new Query with the given sort criteria.
-	 * @param terms a list of sort criteria
-	 * @return the created query.
-	 */
-	public function orderby(...terms):Query
-	{
-		return new Query(null, null, terms);
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/range.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/range.as
deleted file mode 100644
index b992cb937a..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/range.as
+++ /dev/null
@@ -1,22 +0,0 @@
-package flare.query.methods
-{
-	import flare.query.Range;
-	
-	/**
-	 * Creates a new 'Range' query operator
-	 * @param min the minimum range value.
-	 *  This value can be an expression or a literal value.
-	 *  Literal values are parsed using the Expression.expr method.
-	 * @param max the maximum range value.
-	 *  This value can be an expression or a literal value.
-	 *  Literal values are parsed using the Expression.expr method.
-	 * @param val the value to test for range inclusion.
-	 *  This value can be an expression or a literal value.
-	 *  Literal values are parsed using the Expression.expr method.
-	 * @return the new query operator
-	 */
-	public function range(min:*, max:*, val:*):Range
-	{
-		return new Range(min, max, val);
-	}
-}
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/select.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/select.as
deleted file mode 100644
index 56bdf4fd44..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/select.as
+++ /dev/null
@@ -1,14 +0,0 @@
-package flare.query.methods
-{
-	import flare.query.Query;
-	
-	/**
-	 * Create a new Query with the given select clauses.
-	 * @param terms a list of select clauses
-	 * @return the created query.
-	 */
-	public function select(...terms):Query
-	{
-		return new Query(terms);
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/stddev.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/stddev.as
deleted file mode 100644
index 6835d8599f..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/stddev.as
+++ /dev/null
@@ -1,15 +0,0 @@
-package flare.query.methods
-{
-	import flare.query.Variance;
-	
-	/**
-	 * Creates a new 'Variance' aggregate query expression that computes
-	 * the population standard deviation.
-	 * @param expr the input expression
-	 * @return the new query operator
-	 */
-	public function stddev(expr:*):Variance
-	{
-		return new Variance(expr, Variance.DEVIATION);
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/sub.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/sub.as
deleted file mode 100644
index 50ac42e424..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/sub.as
+++ /dev/null
@@ -1,19 +0,0 @@
-package flare.query.methods
-{
-	import flare.query.Arithmetic;
-
-	/**
-	 * Creates a new 'Subtract' query operator
-	 * @param a the left side argument. 
-	 *  This value can be an expression or a literal value.
-	 *  Literal values are parsed using the Expression.expr method.
-	 * @param b the right side argument
-	 *  This value can be an expression or a literal value.
-	 *  Literal values are parsed using the Expression.expr method.
-	 * @return the new query operator
-	 */
-	public function sub(a:*, b:*):Arithmetic
-	{
-		return Arithmetic.Subtract(a, b);
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/sum.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/sum.as
deleted file mode 100644
index a4c85d2508..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/sum.as
+++ /dev/null
@@ -1,14 +0,0 @@
-package flare.query.methods
-{
-	import flare.query.Sum;
-	
-	/**
-	 * Creates a new 'Sum' aggregate query expression.
-	 * @param expr the input expression
-	 * @return the new query operator
-	 */
-	public function sum(expr:*):Sum
-	{
-		return new Sum(expr);
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/variance.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/variance.as
deleted file mode 100644
index f665603cd6..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/variance.as
+++ /dev/null
@@ -1,15 +0,0 @@
-package flare.query.methods
-{
-	import flare.query.Variance;
-	
-	/**
-	 * Creates a new 'Variance' aggregate query expression that computes
-	 * the population variance.
-	 * @param expr the input expression
-	 * @return the new query operator
-	 */
-	public function variance(expr:*):Variance
-	{
-		return new Variance(expr);
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/where.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/where.as
deleted file mode 100644
index ebf7d68afb..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/where.as
+++ /dev/null
@@ -1,14 +0,0 @@
-package flare.query.methods
-{
-	import flare.query.Query;
-	
-	/**
-	 * Create a new Query with the given filter expression.
-	 * @param expr the filter expression
-	 * @return the created query.
-	 */
-	public function where(expr:*):Query
-	{
-		return new Query().where(expr);
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/xor.as b/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/xor.as
deleted file mode 100644
index 7237335485..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.query/flare/query/methods/xor.as
+++ /dev/null
@@ -1,16 +0,0 @@
-package flare.query.methods
-{
-	import flare.query.Xor;
-	
-	/**
-	 * Creates a new 'Xor' (exclusive or) query operator
-	 * @param rest a list of expressions to include in the exclusive or
-	 * @return the new query operator
-	 */
-	public function xor(...rest):Xor
-	{
-		var x:Xor = new Xor();
-		x.setChildren(rest);
-		return x;
-	}	
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.tests/.actionScriptProperties b/grade/report/visual/flare_visualization/flare/flare.tests/.actionScriptProperties
deleted file mode 100644
index c0ef0112f4..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.tests/.actionScriptProperties
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<actionScriptProperties mainApplicationPath="tests.as" version="3">
-  <compiler additionalCompilerArguments="" copyDependentFiles="true" enableModuleDebug="true" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="true" htmlHistoryManagement="true" htmlPlayerVersion="9.0.28" htmlPlayerVersionCheck="true" outputFolderPath="bin" strict="true" useApolloConfig="false" verifyDigests="true" warn="true">
-    <compilerSourcePath/>
-    <libraryPath defaultLinkType="1">
-      <libraryPathEntry kind="4" path="">
-        <excludedEntries>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation_charts.swc" useDefaultLinkType="false"/>
-          <libraryPathEntry kind="1" linkType="1" path="${PROJECT_FRAMEWORKS}/locale/{locale}"/>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/qtp.swc" useDefaultLinkType="false"/>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/rpc.swc" useDefaultLinkType="false"/>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/charts.swc" useDefaultLinkType="false"/>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/framework.swc" useDefaultLinkType="false"/>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/datavisualization.swc" useDefaultLinkType="false"/>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation.swc" useDefaultLinkType="false"/>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation_dmv.swc" useDefaultLinkType="false"/>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation_agent.swc" useDefaultLinkType="false"/>
-        </excludedEntries>
-      </libraryPathEntry>
-      <libraryPathEntry kind="3" linkType="1" path="lib/unitest.swc" useDefaultLinkType="false"/>
-      <libraryPathEntry kind="3" linkType="1" path="/flare.animate/bin/flare.animate.swc" useDefaultLinkType="false"/>
-      <libraryPathEntry kind="3" linkType="1" path="/flare.data/bin/flare.data.swc" useDefaultLinkType="false"/>
-      <libraryPathEntry kind="3" linkType="1" path="/flare.physics/bin/flare.physics.swc" useDefaultLinkType="false"/>
-      <libraryPathEntry kind="3" linkType="1" path="/flare.query/bin/flare.query.swc" useDefaultLinkType="false"/>
-      <libraryPathEntry kind="3" linkType="1" path="/flare.util/bin/flare.util.swc" useDefaultLinkType="false"/>
-      <libraryPathEntry kind="3" linkType="1" path="/flare.vis/bin/flare.vis.swc" useDefaultLinkType="false"/>
-    </libraryPath>
-    <sourceAttachmentPath/>
-  </compiler>
-  <applications>
-    <application path="tests.as"/>
-  </applications>
-  <modules/>
-  <buildCSSFiles/>
-</actionScriptProperties>
diff --git a/grade/report/visual/flare_visualization/flare/flare.tests/.project b/grade/report/visual/flare_visualization/flare/flare.tests/.project
deleted file mode 100644
index 1289b13df1..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.tests/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>flare.tests</name>
-	<comment></comment>
-	<projects>
-		<project>flare.animate</project>
-		<project>flare.data</project>
-		<project>flare.physics</project>
-		<project>flare.query</project>
-		<project>flare.util</project>
-		<project>flare.vis</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.adobe.flexbuilder.project.flexbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.adobe.flexbuilder.project.actionscriptnature</nature>
-	</natures>
-</projectDescription>
diff --git a/grade/report/visual/flare_visualization/flare/flare.tests/bin/AC_OETags.js b/grade/report/visual/flare_visualization/flare/flare.tests/bin/AC_OETags.js
deleted file mode 100644
index 2fb2fe9823..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.tests/bin/AC_OETags.js
+++ /dev/null
@@ -1,275 +0,0 @@
-// Flash Player Version Detection - Rev 1.6
-// Detect Client Browser type
-// Copyright(c) 2005-2006 Adobe Macromedia Software, LLC. All rights reserved.
-var isIE  = (navigator.appVersion.indexOf("MSIE") != -1) ? true : false;
-var isWin = (navigator.appVersion.toLowerCase().indexOf("win") != -1) ? true : false;
-var isOpera = (navigator.userAgent.indexOf("Opera") != -1) ? true : false;
-
-function ControlVersion()
-{
-	var version;
-	var axo;
-	var e;
-
-	// NOTE : new ActiveXObject(strFoo) throws an exception if strFoo isn't in the registry
-
-	try {
-		// version will be set for 7.X or greater players
-		axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.7");
-		version = axo.GetVariable("$version");
-	} catch (e) {
-	}
-
-	if (!version)
-	{
-		try {
-			// version will be set for 6.X players only
-			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.6");
-			
-			// installed player is some revision of 6.0
-			// GetVariable("$version") crashes for versions 6.0.22 through 6.0.29,
-			// so we have to be careful. 
-			
-			// default to the first public version
-			version = "WIN 6,0,21,0";
-
-			// throws if AllowScripAccess does not exist (introduced in 6.0r47)		
-			axo.AllowScriptAccess = "always";
-
-			// safe to call for 6.0r47 or greater
-			version = axo.GetVariable("$version");
-
-		} catch (e) {
-		}
-	}
-
-	if (!version)
-	{
-		try {
-			// version will be set for 4.X or 5.X player
-			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.3");
-			version = axo.GetVariable("$version");
-		} catch (e) {
-		}
-	}
-
-	if (!version)
-	{
-		try {
-			// version will be set for 3.X player
-			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.3");
-			version = "WIN 3,0,18,0";
-		} catch (e) {
-		}
-	}
-
-	if (!version)
-	{
-		try {
-			// version will be set for 2.X player
-			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash");
-			version = "WIN 2,0,0,11";
-		} catch (e) {
-			version = -1;
-		}
-	}
-	
-	return version;
-}
-
-// JavaScript helper required to detect Flash Player PlugIn version information
-function GetSwfVer(){
-	// NS/Opera version >= 3 check for Flash plugin in plugin array
-	var flashVer = -1;
-	
-	if (navigator.plugins != null && navigator.plugins.length > 0) {
-		if (navigator.plugins["Shockwave Flash 2.0"] || navigator.plugins["Shockwave Flash"]) {
-			var swVer2 = navigator.plugins["Shockwave Flash 2.0"] ? " 2.0" : "";
-			var flashDescription = navigator.plugins["Shockwave Flash" + swVer2].description;
-			var descArray = flashDescription.split(" ");
-			var tempArrayMajor = descArray[2].split(".");			
-			var versionMajor = tempArrayMajor[0];
-			var versionMinor = tempArrayMajor[1];
-			var versionRevision = descArray[3];
-			if (versionRevision == "") {
-				versionRevision = descArray[4];
-			}
-			if (versionRevision[0] == "d") {
-				versionRevision = versionRevision.substring(1);
-			} else if (versionRevision[0] == "r") {
-				versionRevision = versionRevision.substring(1);
-				if (versionRevision.indexOf("d") > 0) {
-					versionRevision = versionRevision.substring(0, versionRevision.indexOf("d"));
-				}
-			}
-			var flashVer = versionMajor + "." + versionMinor + "." + versionRevision;
-		}
-	}
-	// MSN/WebTV 2.6 supports Flash 4
-	else if (navigator.userAgent.toLowerCase().indexOf("webtv/2.6") != -1) flashVer = 4;
-	// WebTV 2.5 supports Flash 3
-	else if (navigator.userAgent.toLowerCase().indexOf("webtv/2.5") != -1) flashVer = 3;
-	// older WebTV supports Flash 2
-	else if (navigator.userAgent.toLowerCase().indexOf("webtv") != -1) flashVer = 2;
-	else if ( isIE && isWin && !isOpera ) {
-		flashVer = ControlVersion();
-	}	
-	return flashVer;
-}
-
-// When called with reqMajorVer, reqMinorVer, reqRevision returns true if that version or greater is available
-function DetectFlashVer(reqMajorVer, reqMinorVer, reqRevision)
-{
-	versionStr = GetSwfVer();
-	if (versionStr == -1 ) {
-		return false;
-	} else if (versionStr != 0) {
-		if(isIE && isWin && !isOpera) {
-			// Given "WIN 2,0,0,11"
-			tempArray         = versionStr.split(" "); 	// ["WIN", "2,0,0,11"]
-			tempString        = tempArray[1];			// "2,0,0,11"
-			versionArray      = tempString.split(",");	// ['2', '0', '0', '11']
-		} else {
-			versionArray      = versionStr.split(".");
-		}
-		var versionMajor      = versionArray[0];
-		var versionMinor      = versionArray[1];
-		var versionRevision   = versionArray[2];
-
-        	// is the major.revision >= requested major.revision AND the minor version >= requested minor
-		if (versionMajor > parseFloat(reqMajorVer)) {
-			return true;
-		} else if (versionMajor == parseFloat(reqMajorVer)) {
-			if (versionMinor > parseFloat(reqMinorVer))
-				return true;
-			else if (versionMinor == parseFloat(reqMinorVer)) {
-				if (versionRevision >= parseFloat(reqRevision))
-					return true;
-			}
-		}
-		return false;
-	}
-}
-
-function AC_AddExtension(src, ext)
-{
-  if (src.indexOf('?') != -1)
-    return src.replace(/\?/, ext+'?'); 
-  else
-    return src + ext;
-}
-
-function AC_Generateobj(objAttrs, params, embedAttrs) 
-{ 
-    var str = '';
-    if (isIE && isWin && !isOpera)
-    {
-  		str += '<object ';
-  		for (var i in objAttrs)
-  			str += i + '="' + objAttrs[i] + '" ';
-  		for (var i in params)
-  			str += '><param name="' + i + '" value="' + params[i] + '" /> ';
-  		str += '></object>';
-    } else {
-  		str += '<embed ';
-  		for (var i in embedAttrs)
-  			str += i + '="' + embedAttrs[i] + '" ';
-  		str += '> </embed>';
-    }
-
-    document.write(str);
-}
-
-function AC_FL_RunContent(){
-  var ret = 
-    AC_GetArgs
-    (  arguments, ".swf", "movie", "clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"
-     , "application/x-shockwave-flash"
-    );
-  AC_Generateobj(ret.objAttrs, ret.params, ret.embedAttrs);
-}
-
-function AC_GetArgs(args, ext, srcParamName, classid, mimeType){
-  var ret = new Object();
-  ret.embedAttrs = new Object();
-  ret.params = new Object();
-  ret.objAttrs = new Object();
-  for (var i=0; i < args.length; i=i+2){
-    var currArg = args[i].toLowerCase();    
-
-    switch (currArg){	
-      case "classid":
-        break;
-      case "pluginspage":
-        ret.embedAttrs[args[i]] = args[i+1];
-        break;
-      case "src":
-      case "movie":	
-        args[i+1] = AC_AddExtension(args[i+1], ext);
-        ret.embedAttrs["src"] = args[i+1];
-        ret.params[srcParamName] = args[i+1];
-        break;
-      case "onafterupdate":
-      case "onbeforeupdate":
-      case "onblur":
-      case "oncellchange":
-      case "onclick":
-      case "ondblClick":
-      case "ondrag":
-      case "ondragend":
-      case "ondragenter":
-      case "ondragleave":
-      case "ondragover":
-      case "ondrop":
-      case "onfinish":
-      case "onfocus":
-      case "onhelp":
-      case "onmousedown":
-      case "onmouseup":
-      case "onmouseover":
-      case "onmousemove":
-      case "onmouseout":
-      case "onkeypress":
-      case "onkeydown":
-      case "onkeyup":
-      case "onload":
-      case "onlosecapture":
-      case "onpropertychange":
-      case "onreadystatechange":
-      case "onrowsdelete":
-      case "onrowenter":
-      case "onrowexit":
-      case "onrowsinserted":
-      case "onstart":
-      case "onscroll":
-      case "onbeforeeditfocus":
-      case "onactivate":
-      case "onbeforedeactivate":
-      case "ondeactivate":
-      case "type":
-      case "codebase":
-        ret.objAttrs[args[i]] = args[i+1];
-        break;
-      case "id":
-      case "width":
-      case "height":
-      case "align":
-      case "vspace": 
-      case "hspace":
-      case "class":
-      case "title":
-      case "accesskey":
-      case "name":
-      case "tabindex":
-        ret.embedAttrs[args[i]] = ret.objAttrs[args[i]] = args[i+1];
-        break;
-      default:
-        ret.embedAttrs[args[i]] = ret.params[args[i]] = args[i+1];
-    }
-  }
-  ret.objAttrs["classid"] = classid;
-  if (mimeType) ret.embedAttrs["type"] = mimeType;
-  return ret;
-}
-
-
diff --git a/grade/report/visual/flare_visualization/flare/flare.tests/bin/deeplinking/deeplinking.css b/grade/report/visual/flare_visualization/flare/flare.tests/bin/deeplinking/deeplinking.css
deleted file mode 100644
index 5275b55216..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.tests/bin/deeplinking/deeplinking.css
+++ /dev/null
@@ -1,6 +0,0 @@
-/* This CSS stylesheet defines styles used by required elements in a DeepLinking application page */
-
-#ie_historyFrame { width: 0px; height: 0px; display:none }
-#firefox_anchorDiv { width: 0px; height: 0px; display:none }
-#safari_formDiv { width: 0px; height: 0px; display:none }
-#safari_rememberDiv { width: 0px; height: 0px; display:none }
diff --git a/grade/report/visual/flare_visualization/flare/flare.tests/bin/deeplinking/deeplinking.js b/grade/report/visual/flare_visualization/flare/flare.tests/bin/deeplinking/deeplinking.js
deleted file mode 100644
index 87a32b42fd..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.tests/bin/deeplinking/deeplinking.js
+++ /dev/null
@@ -1,517 +0,0 @@
-DeepLinkingUtils = {
-	addEvent: function(elm, evType, fn, useCapture) {
-		useCapture = useCapture || false;
-		if (elm.addEventListener) {
-			elm.addEventListener(evType, fn, useCapture);
-			return true;
-		}
-		else if (elm.attachEvent) {
-			var r = elm.attachEvent('on' + evType, fn);
-			return r;
-		}
-		else {
-			elm['on' + evType] = fn;
-		}
-	}
-}
-
-DeepLinking = (function() {
-	// type of browser
-    var browser = {
-        ie: false, 
-        firefox: false, 
-        safari: false, 
-        opera: false, 
-        version: -1
-    };
-
-    // Default app state URL to use when no fragment ID present
-    var defaultHash = '';
-
-    // Last-known app state URL
-    var currentHref = document.location.href;
-
-    // Initial URL (used only by IE)
-    var initialHref = document.location.href;
-
-    // Initial URL (used only by IE)
-    var initialHash = document.location.hash;
-
-    // History frame source URL prefix (used only by IE)
-    var historyFrameSourcePrefix = 'deeplinking/historyFrame.html?';
-
-    // History maintenance (used only by Safari)
-    var currentHistoryLength = -1;
-
-    var historyHash = [];
-
-    var initialState = createState(initialHref, initialHref + '#' + initialHash, initialHash);
-
-    var backStack = [];
-    var forwardStack = [];
-
-	//UserAgent detection
-    var useragent = navigator.userAgent.toLowerCase();
-
-    if (useragent.indexOf("opera") != -1) {
-        browser.opera = true;
-    } else if (useragent.indexOf("msie") != -1) {
-        browser.ie = true;
-        browser.version = parseFloat(useragent.substring(useragent.indexOf('msie') + 4));
-    } else if (useragent.indexOf("safari") != -1) {
-        browser.safari = true;
-        browser.version = parseFloat(useragent.substring(useragent.indexOf('safari') + 7));
-    } else if (useragent.indexOf("gecko") != -1) {
-        browser.firefox = true;
-    }
-
-    // Accessor functions for obtaining specific elements of the page.
-    function getHistoryFrame()
-    {
-        return document.getElementById('ie_historyFrame');
-    }
-
-    function getAnchorElement()
-    {
-        return document.getElementById('firefox_anchorDiv');
-    }
-
-    function getFormElement()
-    {
-        return document.getElementById('safari_formDiv');
-    }
-
-	function getRememberElement()
-	{
-		return document.getElementById("safari_remember_field");
-	}
-
-    /* Get the Flash player object for performing ExternalInterface callbacks. */
-    function getPlayer() {
-        var player = null; /* AJH, needed?  = document.getElementById(getPlayerId()); */
-        
-        if (player == null) {
-            player = document.getElementsByTagName('object')[0];
-        }
-        
-        if (player == null || player.object == null) {
-            player = document.getElementsByTagName('embed')[0];
-        }
-
-        return player;
-    }
-
-    /* Get the current location hash excluding the '#' symbol. */
-    function getHash() {
-       // It would be nice if we could use document.location.hash here,
-       // but it's faulty sometimes.
-       var idx = document.location.href.indexOf('#');
-       return (idx >= 0) ? document.location.href.substr(idx+1) : '';
-    }
-
-    /* Get the current location hash excluding the '#' symbol. */
-    function setHash(hash) {
-       // It would be nice if we could use document.location.hash here,
-       // but it's faulty sometimes.
-       if (hash == '') hash = '#'
-       document.location.hash = hash;
-    }
-
-    function createState(baseUrl, newUrl, flexAppUrl) {
-        return { 'baseUrl': baseUrl, 'newUrl': newUrl, 'flexAppUrl': flexAppUrl, 'title': null };
-    }
-
-    /* Add a history entry to the browser.
-     *   baseUrl: the portion of the location prior to the '#'
-     *   newUrl: the entire new URL, including '#' and following fragment
-     *   flexAppUrl: the portion of the location following the '#' only
-     */
-    function addHistoryEntry(baseUrl, newUrl, flexAppUrl, copyToAddressBar) {
-
-        //delete all the history entries
-        forwardStack = [];
-
-        if (browser.ie) {
-            //Check to see if we are being asked to do a navigate for the first
-            //history entry, and if so ignore, because it's coming from the creation
-            //of the history iframe
-            if (flexAppUrl == defaultHash && document.location.href == initialHref && _ie_firstload) {
-                currentHref = initialHref;
-                return;
-            }
-            if ((!flexAppUrl || flexAppUrl == defaultHash) && _ie_firstload) {
-                newUrl = baseUrl + '#' + defaultHash;
-                flexAppUrl = defaultHash;
-            } else {
-                // for IE, tell the history frame to go somewhere without a '#'
-                // in order to get this entry into the browser history.
-                getHistoryFrame().src = historyFrameSourcePrefix + flexAppUrl;
-            }
-            if (copyToAddressBar) {
-                setHash(flexAppUrl);
-                //document.location.href = newUrl;
-            }
-        } else {
-
-            //ADR
-            if (backStack.length == 0 && initialState.flexAppUrl == flexAppUrl) {
-                initialState = createState(baseUrl, newUrl, flexAppUrl);
-            } else if(backStack.length > 0 && backStack[backStack.length - 1].flexAppUrl == flexAppUrl) {
-                backStack[backStack.length - 1] = createState(baseUrl, newUrl, flexAppUrl);
-            }
-
-            if (browser.safari) {
-                // for Safari, submit a form whose action points to the desired URL
-                if (browser.version <= 419.3) {
-                    var file = window.location.pathname.toString();
-                    file = file.substring(file.lastIndexOf("/")+1);
-                    getFormElement().innerHTML = '<form name="historyForm" action="'+file+'#' + flexAppUrl + '" method="GET"></form>';
-                    //get the current elements and add them to the form
-                    var qs = window.location.search.substring(1);
-                    var qs_arr = qs.split("&");
-                    for (var i = 0; i < qs_arr.length; i++) {
-                        var tmp = qs_arr[i].split("=");
-                        var elem = document.createElement("input");
-                        elem.type = "hidden";
-                        elem.name = tmp[0];
-                        elem.value = tmp[1];
-                        document.forms.historyForm.appendChild(elem);
-                    }
-                    document.forms.historyForm.submit();
-                } else {
-                    top.location.hash = flexAppUrl;
-                }
-                // We also have to maintain the history by hand for Safari
-                historyHash[history.length] = flexAppUrl;
-                _storeStates();
-            } else {
-                // Otherwise, write an anchor into the page and tell the browser to go there
-                addAnchor(flexAppUrl);
-                if (copyToAddressBar) {
-                    setHash(flexAppUrl);
-                }
-           }
-        }
-        backStack.push(createState(baseUrl, newUrl, flexAppUrl));
-    }
-
-    function _storeStates() {
-        if (browser.safari) {
-            getRememberElement().value = historyHash.join(",");
-        }
-    }
-
-    function handleBackButton() {
-        //The "current" page is always at the top of the history stack.
-        var current = backStack.pop();
-        if (!current) { return; }
-        var last = backStack[backStack.length - 1];
-        if (!last && backStack.length == 0){
-            last = initialState;
-        }
-        forwardStack.push(current);
-    }
-
-    function handleForwardButton() {
-        //summary: private method. Do not call this directly.
-
-        var last = forwardStack.pop();
-        if (!last) { return; }
-        backStack.push(last);
-    }
-
-    function handleArbitraryUrl() {
-        //delete all the history entries
-        forwardStack = [];
-    }
-
-    /* Called periodically to poll to see if we need to detect navigation that has occurred */
-    function checkForUrlChange() {
-
-        if (browser.ie) {
-            if (currentHref != document.location.href && currentHref + '#' != document.location.href) {
-                //This occurs when the user has navigated to a specific URL
-                //within the app, and didn't use browser back/forward
-                //IE seems to have a bug where it stops updating the URL it
-                //shows the end-user at this point, but programatically it
-                //appears to be correct.  Do a full app reload to get around
-                //this issue.
-                if (browser.version < 7) {
-                    currentHref = document.location.href;
-                    document.location.reload();
-                } else {
-                    //getHistoryFrame().src = historyFrameSourcePrefix + getHash();
-                }
-            }
-		}
-
-		if (browser.safari) {
-            // For Safari, we have to check to see if history.length changed.
-            if (currentHistoryLength >= 0 && history.length != currentHistoryLength) {
-				//alert("did change: " + history.length + ", " + historyHash.length + "|" + historyHash[history.length] + "|>" + historyHash.join("|"));
-                // If it did change, then we have to look the old state up
-                // in our hand-maintained array since document.location.hash
-                // won't have changed, then call back into BrowserManager.
-                currentHistoryLength = history.length;
-                var flexAppUrl = historyHash[currentHistoryLength];
-                if (flexAppUrl == '') {
-                    //flexAppUrl = defaultHash;
-                }
-                getPlayer().browserURLChange(flexAppUrl);
-                _storeStates();
-            }
-		}
-		if (browser.firefox) {
-            if (currentHref != document.location.href) {
-                var bsl = backStack.length;
-
-                var urlActions = {
-                    back: false, 
-                    forward: false, 
-                    set: false
-                }
-
-                if ((window.location.hash == initialHash || window.location.href == initialHref) && (bsl == 1)) {
-                    urlActions.back = true;
-                    // FIXME: could this ever be a forward button?
-                    // we can't clear it because we still need to check for forwards. Ugg.
-                    // clearInterval(this.locationTimer);
-                    handleBackButton();
-                }
-                
-                // first check to see if we could have gone forward. We always halt on
-                // a no-hash item.
-                if (forwardStack.length > 0) {
-                    if (forwardStack[forwardStack.length-1].flexAppUrl == getHash()) {
-                        urlActions.forward = true;
-                        handleForwardButton();
-                    }
-                }
-
-                // ok, that didn't work, try someplace back in the history stack
-                if ((bsl >= 2) && (backStack[bsl - 2])) {
-                    if (backStack[bsl - 2].flexAppUrl == getHash()) {
-                        urlActions.back = true;
-                        handleBackButton();
-                    }
-                }
-                
-                if (!urlActions.back && !urlActions.forward) {
-                    var foundInStacks = {
-                        back: -1, 
-                        forward: -1
-                    }
-
-                    for (var i = 0; i < backStack.length; i++) {
-                        if (backStack[i].flexAppUrl == getHash() && i != (bsl - 2)) {
-                            arbitraryUrl = true;
-                            foundInStacks.back = i;
-                        }
-                    }
-                    for (var i = 0; i < forwardStack.length; i++) {
-                        if (forwardStack[i].flexAppUrl == getHash() && i != (bsl - 2)) {
-                            arbitraryUrl = true;
-                            foundInStacks.forward = i;
-                        }
-                    }
-                    handleArbitraryUrl();
-                }
-
-                // Firefox changed; do a callback into BrowserManager to tell it.
-                currentHref = document.location.href;
-                var flexAppUrl = getHash();
-                if (flexAppUrl == '') {
-                    //flexAppUrl = defaultHash;
-                }
-                getPlayer().browserURLChange(flexAppUrl);
-            }
-        }
-        //setTimeout(checkForUrlChange, 50);
-    }
-
-    /* Write an anchor into the page to legitimize it as a URL for Firefox et al. */
-    function addAnchor(flexAppUrl)
-    {
-       if (document.getElementsByName(flexAppUrl).length == 0) {
-           getAnchorElement().innerHTML += "<a name='" + flexAppUrl + "'>" + flexAppUrl + "</a>";
-       }
-    }
-
-    var _initialize = function () {
-		if (browser.ie)
-		{
-            var scripts = document.getElementsByTagName('script');
-            for (var i = 0, s; s = scripts[i]; i++) {
-                if (s.src.indexOf("deeplinking.js") > -1) {
-                    var iframe_location = (new String(s.src)).replace("deeplinking.js", "historyFrame.html");
-                }
-            }
-			historyFrameSourcePrefix = iframe_location + "?";
-			var src = historyFrameSourcePrefix;
-
-            var iframe = document.createElement("iframe");
-            iframe.id = 'ie_historyFrame';
-            iframe.name = 'ie_historyFrame';
-            //iframe.src = historyFrameSourcePrefix;
-            document.body.appendChild(iframe);
-		}
-
-		if (browser.safari)
-		{
-			var rememberDiv = document.createElement("div");
-			rememberDiv.id = 'asafari_rememberDiv';
-			document.body.appendChild(rememberDiv);
-			rememberDiv.innerHTML = '<input type="text" id="safari_remember_field" style="width: 500px;">';
-
-			var formDiv = document.createElement("div");
-			formDiv.id = 'safari_formDiv';
-			document.body.appendChild(formDiv);
-
-            var reloader_content = document.createElement('div');
-            reloader_content.id = 'safarireloader';
-            var scripts = document.getElementsByTagName('script');
-            for (var i = 0, s; s = scripts[i]; i++) {
-                if (s.src.indexOf("deeplinking.js") > -1) {
-                    html = (new String(s.src)).replace(".js", ".html");
-                }
-            }
-            reloader_content.innerHTML = '<iframe id="safarireloader-iframe" src="about:blank" frameborder="no" scrolling="no"></iframe>';
-            document.body.appendChild(reloader_content);
-            reloader_content.style.position = 'absolute';
-            reloader_content.style.left = reloader_content.style.top = '-9999px';
-            iframe = reloader_content.getElementsByTagName('iframe')[0];
-
-			if (document.getElementById("safari_remember_field").value != "" ) {
-				historyHash = document.getElementById("safari_remember_field").value.split(",");
-			}
-
-		}
-
-		if (browser.firefox)
-		{
-			var anchorDiv = document.createElement("div");
-			anchorDiv.id = 'firefox_anchorDiv';
-			document.body.appendChild(anchorDiv);
-		}
-        
-        //setTimeout(checkForUrlChange, 50);
-    }
-
-    return {
-		historyHash: historyHash, 
-        backStack: function() { return backStack; }, 
-        forwardStack: function() { return forwardStack }, 
-        getPlayer: getPlayer, 
-        initialize: function(src) {
-            _initialize(src);
-        }, 
-        setURL: function(url) {
-            document.location.href = url;
-        }, 
-        getURL: function() {
-            return document.location.href;
-        }, 
-        getTitle: function() {
-            return document.title;
-        }, 
-        setTitle: function(title) {
-            try {
-                backStack[backStack.length - 1].title = title;
-            } catch(e) { }
-            
-            document.title = title;
-        }, 
-        setDefaultURL: function(def)
-        {
-            defaultHash = def;
-            def = getHash();
-            //trailing ? is important else an extra frame gets added to the history
-            //when navigating back to the first page.  Alternatively could check
-            //in history frame navigation to compare # and ?.
-			if (browser.ie)
-			{
-                _ie_firstload = true;
-                getHistoryFrame().src = historyFrameSourcePrefix + def;
-                window.location.replace("#" + def);
-                setInterval(checkForUrlChange, 50);
-			}
-
-			if (browser.safari)
-			{
-                currentHistoryLength = history.length;
-                if (historyHash.length == 0) {
-                    historyHash[currentHistoryLength] = defaultHash;
-                    var newloc = "#" + def;
-                    window.location.replace(newloc);
-                } else {
-                    //alert(historyHash[historyHash.length-1]);
-                }
-                //setHash(def);
-                setInterval(checkForUrlChange, 50);
-			}
-			
-			
-			if (browser.firefox || browser.opera)
-			{
-                var reg = new RegExp("#" + def + "$");
-                if (window.location.toString().match(reg)) {
-                } else {
-                    var newloc ="#" + def;
-                    window.location.replace(newloc);
-                }
-                setInterval(checkForUrlChange, 50);
-                //setHash(def);
-            }
-        }, 
-
-        /* Set the current browser URL; called from inside BrowserManager to propagate
-         * the application state out to the container.
-         */
-        setBrowserURL: function(flexAppUrl, copyToAddressBar) {
-           //fromIframe = fromIframe || false;
-           //fromFlex = fromFlex || false;
-           //alert("setBrowserURL: " + flexAppUrl);
-           //flexAppUrl = (flexAppUrl == "") ? defaultHash : flexAppUrl ;
-
-           var pos = document.location.href.indexOf('#');
-           var baseUrl = pos != -1 ? document.location.href.substr(0, pos) : document.location.href;
-           var newUrl = baseUrl + '#' + flexAppUrl;
-
-           if (document.location.href != newUrl && document.location.href + '#' != newUrl) {
-               currentHref = newUrl;
-               addHistoryEntry(baseUrl, newUrl, flexAppUrl, copyToAddressBar);
-               currentHistoryLength = history.length;
-           }
-
-           return false;
-        } 
-
-    }
-
-})();
-
-// Initialization
-
-// Automated unit testing and other diagnostics
-
-function setURL(url)
-{
-    document.location.href = url;
-}
-
-function backButton()
-{
-    history.back();
-}
-
-function forwardButton()
-{
-    history.forward();
-}
-
-function goForwardOrBackInHistory(step)
-{
-    history.go(step);
-}
-
-DeepLinkingUtils.addEvent(window, "load", function() { DeepLinking.initialize(); });
diff --git a/grade/report/visual/flare_visualization/flare/flare.tests/bin/deeplinking/historyFrame.html b/grade/report/visual/flare_visualization/flare/flare.tests/bin/deeplinking/historyFrame.html
deleted file mode 100644
index 55788e05d8..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.tests/bin/deeplinking/historyFrame.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<html>
-    <head>
-        <META HTTP-EQUIV="Pragma" CONTENT="no-cache"> 
-        <META HTTP-EQUIV="Expires" CONTENT="-1"> 
-    </head>
-    <body>
-    <script>
-        function processUrl()
-        {
-
-            var pos = url.indexOf("?");
-            url = pos != -1 ? url.substr(pos + 1) : "";
-            if (!parent._ie_firstload) {
-                parent.DeepLinking.setBrowserURL(url, true);
-                try {
-                    parent.DeepLinking.getPlayer().browserURLChange(url);
-                } catch(e) { }
-            } else {
-                parent._ie_firstload = false;
-            }
-        }
-
-        var url = document.location.href;
-        processUrl();
-        document.write(url);
-    </script>
-    Yo, I'm your history.
-    </body>
-</html>
diff --git a/grade/report/visual/flare_visualization/flare/flare.tests/bin/playerProductInstall.swf b/grade/report/visual/flare_visualization/flare/flare.tests/bin/playerProductInstall.swf
deleted file mode 100644
index bdc3437856..0000000000
Binary files a/grade/report/visual/flare_visualization/flare/flare.tests/bin/playerProductInstall.swf and /dev/null differ
diff --git a/grade/report/visual/flare_visualization/flare/flare.tests/bin/tests.html b/grade/report/visual/flare_visualization/flare/flare.tests/bin/tests.html
deleted file mode 100644
index 79e1b9f12f..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.tests/bin/tests.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<!-- saved from url=(0014)about:internet -->
-<html lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-
-<!--  BEGIN DeepLinking required section -->
-<link rel="stylesheet" type="text/css" href="deeplinking/deeplinking.css" />
-<!--  END DeepLinking required section -->
-
-<title></title>
-<script src="AC_OETags.js" language="javascript"></script>
-
-<!--  BEGIN DeepLinking required section -->
-<script src="deeplinking/deeplinking.js" language="javascript"></script>
-<!--  END DeepLinking required section -->
-
-<style>
-body { margin: 0px; overflow:hidden }
-</style>
-<script language="JavaScript" type="text/javascript">
-<!--
-// -----------------------------------------------------------------------------
-// Globals
-// Major version of Flash required
-var requiredMajorVersion = 9;
-// Minor version of Flash required
-var requiredMinorVersion = 0;
-// Minor version of Flash required
-var requiredRevision = 28;
-// -----------------------------------------------------------------------------
-// -->
-</script>
-</head>
-
-<body scroll="no">
-<script language="JavaScript" type="text/javascript">
-<!--
-// Version check for the Flash Player that has the ability to start Player Product Install (6.0r65)
-var hasProductInstall = DetectFlashVer(6, 0, 65);
-
-// Version check based upon the values defined in globals
-var hasRequestedVersion = DetectFlashVer(requiredMajorVersion, requiredMinorVersion, requiredRevision);
-
-
-// Check to see if a player with Flash Product Install is available and the version does not meet the requirements for playback
-if ( hasProductInstall && !hasRequestedVersion ) {
-	// MMdoctitle is the stored document.title value used by the installation process to close the window that started the process
-	// This is necessary in order to close browser windows that are still utilizing the older version of the player after installation has completed
-	// DO NOT MODIFY THE FOLLOWING FOUR LINES
-	// Location visited after installation is complete if installation is required
-	var MMPlayerType = (isIE == true) ? "ActiveX" : "PlugIn";
-	var MMredirectURL = window.location;
-    document.title = document.title.slice(0, 47) + " - Flash Player Installation";
-    var MMdoctitle = document.title;
-
-	AC_FL_RunContent(
-		"src", "playerProductInstall",
-		"FlashVars", "MMredirectURL="+MMredirectURL+'&MMplayerType='+MMPlayerType+'&MMdoctitle='+MMdoctitle+"",
-		"width", "800",
-		"height", "600",
-		"align", "middle",
-		"id", "tests",
-		"quality", "high",
-		"bgcolor", "#ffffff",
-		"name", "tests",
-		"allowScriptAccess","sameDomain",
-		"type", "application/x-shockwave-flash",
-		"pluginspage", "http://www.adobe.com/go/getflashplayer"
-	);
-} else if (hasRequestedVersion) {
-	// if we've detected an acceptable version
-	// embed the Flash Content SWF when all tests are passed
-	AC_FL_RunContent(
-			"src", "tests",
-			"width", "800",
-			"height", "600",
-			"align", "middle",
-			"id", "tests",
-			"quality", "high",
-			"bgcolor", "#ffffff",
-			"name", "tests",
-			"allowScriptAccess","sameDomain",
-			"type", "application/x-shockwave-flash",
-			"pluginspage", "http://www.adobe.com/go/getflashplayer"
-	);
-  } else {  // flash is too old or we can't detect the plugin
-    var alternateContent = 'Alternate HTML content should be placed here. '
-  	+ 'This content requires the Adobe Flash Player. '
-   	+ '<a href=http://www.adobe.com/go/getflash/>Get Flash</a>';
-    document.write(alternateContent);  // insert non-flash content
-  }
-// -->
-</script>
-<noscript>
-  	<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
-			id="tests" width="800" height="600"
-			codebase="http://fpdownload.macromedia.com/get/flashplayer/current/swflash.cab">
-			<param name="movie" value="tests.swf" />
-			<param name="quality" value="high" />
-			<param name="bgcolor" value="#ffffff" />
-			<param name="allowScriptAccess" value="sameDomain" />
-			<embed src="tests.swf" quality="high" bgcolor="#ffffff"
-				width="800" height="600" name="tests" align="middle"
-				play="true"
-				loop="false"
-				quality="high"
-				allowScriptAccess="sameDomain"
-				type="application/x-shockwave-flash"
-				pluginspage="http://www.adobe.com/go/getflashplayer">
-			</embed>
-	</object>
-</noscript>
-</body>
-</html>
diff --git a/grade/report/visual/flare_visualization/flare/flare.tests/bin/tests.swf b/grade/report/visual/flare_visualization/flare/flare.tests/bin/tests.swf
deleted file mode 100644
index 7ff2b40176..0000000000
Binary files a/grade/report/visual/flare_visualization/flare/flare.tests/bin/tests.swf and /dev/null differ
diff --git a/grade/report/visual/flare_visualization/flare/flare.tests/flare/tests/AnimationTests.as b/grade/report/visual/flare_visualization/flare/flare.tests/flare/tests/AnimationTests.as
deleted file mode 100644
index 19f2c19fff..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.tests/flare/tests/AnimationTests.as
+++ /dev/null
@@ -1,193 +0,0 @@
-package flare.tests
-{
-	import flare.animate.interpolate.ArrayInterpolator;
-	import flare.animate.interpolate.ColorInterpolator;
-	import flare.animate.interpolate.DateInterpolator;
-	import flare.animate.interpolate.MatrixInterpolator;
-	import flare.animate.interpolate.NumberInterpolator;
-	import flare.animate.interpolate.PointInterpolator;
-	import flare.animate.interpolate.RectangleInterpolator;
-	import flare.util.Colors;
-	
-	import flash.geom.Matrix;
-	import flash.geom.Point;
-	import flash.geom.Rectangle;
-	
-	import unitest.TestCase;
-
-	public class AnimationTests extends TestCase
-	{
-		public function AnimationTests() {
-			addTest("testNumberInterp");
-			addTest("testDateInterp");
-			addTest("testColorInterp");
-			addTest("testArrayInterp");
-			addTest("testPointInterp");
-			addTest("testRectangleInterp");
-			addTest("testMatrixInterp");
-		}
-		
-		public function testNumberInterp():void {
-			var o:Object = {};
-			var ni:NumberInterpolator = new NumberInterpolator(o, "v", 0, 1);
-			
-			for (var f:Number=0; f<=1.0; f+=0.1) {
-				ni.interpolate(f);
-				assertEquals(f, o.v);
-			}
-		}
-		
-		public function testColorInterp():void {
-			var s:uint = 0x00ff0000;
-			var t:uint = 0x000000ff;
-			var o:Object = {v:s};
-			var ci:ColorInterpolator = new ColorInterpolator(o, "v", s, t);
-			
-			for (var f:Number=0; f<=1.0; f+=0.1) {
-				ci.interpolate(f);
-				assertEquals(Colors.interpolate(s,t,f), o.v);
-			}
-			
-			s = 0xff00ff00;
-			t = 0x00ff0000;
-			ci.reset(o, "v", s, t);
-			for (f=0; f<=1.0; f+=0.1) {
-				ci.interpolate(f);
-				assertEquals(Colors.interpolate(s,t,f), o.v);
-			}
-		}
-		
-		public function testDateInterp():void {
-			var t0:Number = 0;
-			var t1:Number = 10000000;
-			var s:Date = new Date(t0);
-			var t:Date = new Date(t1);
-			var o:Object = {};
-			var di:DateInterpolator = new DateInterpolator(o, "v", s, t);
-			
-			for (var f:Number=0; f<=1.0; f+=0.1) {
-				di.interpolate(f);
-				assertTrue(Math.abs(f*t1 - o.v.time) < 2);
-			}
-			assertNotEquals(s, o.v);
-			assertNotEquals(t, o.v);
-			
-			di.reset(o, "v", s, o.v);
-			for (f=0; f<=1.0; f+=0.1) {
-				di.interpolate(f);
-				assertTrue(Math.abs(f*t1 - o.v.time) < 2);
-			}
-			assertNotEquals(s, o.v);
-			assertNotEquals(t, o.v);
-		}
-		
-		public function testArrayInterp():void {
-			var s:Array = [0, 0, 0, 0, 0];
-			var t:Array = [1, 1, 1, 1, 1];
-			var o:Object = {v:s};
-			var ai:ArrayInterpolator = new ArrayInterpolator(o, "v", o.v, t);
-			
-			for (var f:Number=0; f<=1.0; f+=0.1) {
-				ai.interpolate(f);
-				for (var i:int=0; i<s.length; ++i)
-					assertTrue(Math.abs(f - o.v[i]) < 0.000001);
-			}
-			assertNotEquals(s, o.v);
-			assertNotEquals(t, o.v);
-			
-			ai.reset(o, "v", s, o.v);
-			for (f=0; f<=1.0; f+=0.1) {
-				ai.interpolate(f);
-				for (i=0; i<s.length; ++i)
-					assertTrue(Math.abs(f - o.v[i]) < 0.000001);
-			}
-			assertNotEquals(s, o.v);
-			assertNotEquals(t, o.v);
-		}
-		
-		public function testPointInterp():void {
-			var s:Point = new Point(0, 0);
-			var t:Point = new Point(1, 1);
-			var o:Object = {v:s};
-			var pi:PointInterpolator = new PointInterpolator(o, "v", o.v, t);
-			
-			for (var f:Number=0; f<=1.0; f+=0.1) {
-				pi.interpolate(f);
-				assertTrue(Math.abs(f - o.v.x) < 0.000001);
-				assertTrue(Math.abs(f - o.v.y) < 0.000001);
-			}
-			assertNotEquals(s, o.v);
-			assertNotEquals(t, o.v);
-			
-			pi.reset(o, "v", s, o.v);
-			for (f=0; f<=1.0; f+=0.1) {
-				pi.interpolate(f);
-				assertTrue(Math.abs(f - o.v.x) < 0.000001);
-				assertTrue(Math.abs(f - o.v.y) < 0.000001);
-			}
-			assertNotEquals(s, o.v);
-			assertNotEquals(t, o.v);
-		}
-		
-		public function testRectangleInterp():void {
-			var s:Rectangle = new Rectangle(0, 0, 0, 0);
-			var t:Rectangle = new Rectangle(1, 1, 1, 1);
-			var o:Object = {v:s};
-			var ri:RectangleInterpolator = new RectangleInterpolator(o, "v", o.v, t);
-			
-			for (var f:Number=0; f<=1.0; f+=0.1) {
-				ri.interpolate(f);
-				assertTrue(Math.abs(f - o.v.x) < 0.000001);
-				assertTrue(Math.abs(f - o.v.y) < 0.000001);
-				assertTrue(Math.abs(f - o.v.width) < 0.000001);
-				assertTrue(Math.abs(f - o.v.height) < 0.000001);
-			}
-			assertNotEquals(s, o.v);
-			assertNotEquals(t, o.v);
-			
-			ri.reset(o, "v", s, o.v);
-			for (f=0; f<=1.0; f+=0.1) {
-				ri.interpolate(f);
-				assertTrue(Math.abs(f - o.v.x) < 0.000001);
-				assertTrue(Math.abs(f - o.v.y) < 0.000001);
-				assertTrue(Math.abs(f - o.v.width) < 0.000001);
-				assertTrue(Math.abs(f - o.v.height) < 0.000001);
-			}
-			assertNotEquals(s, o.v);
-			assertNotEquals(t, o.v);
-		}
-		
-		public function testMatrixInterp():void {
-			var s:Matrix = new Matrix(0, 0, 0, 0, 0, 0);
-			var t:Matrix = new Matrix(1, 1, 1, 1, 1, 1);
-			var o:Object = {v:s};
-			var mi:MatrixInterpolator = new MatrixInterpolator(o, "v", o.v, t);
-			
-			for (var f:Number=0; f<=1.0; f+=0.1) {
-				mi.interpolate(f);
-				assertTrue(Math.abs(f - o.v.a) < 0.000001);
-				assertTrue(Math.abs(f - o.v.b) < 0.000001);
-				assertTrue(Math.abs(f - o.v.c) < 0.000001);
-				assertTrue(Math.abs(f - o.v.d) < 0.000001);
-				assertTrue(Math.abs(f - o.v.tx) < 0.000001);
-				assertTrue(Math.abs(f - o.v.ty) < 0.000001);
-			}
-			assertNotEquals(s, o.v);
-			assertNotEquals(t, o.v);
-			
-			mi.reset(o, "v", s, o.v);
-			for (f=0; f<=1.0; f+=0.1) {
-				mi.interpolate(f);
-				assertTrue(Math.abs(f - o.v.a) < 0.000001);
-				assertTrue(Math.abs(f - o.v.b) < 0.000001);
-				assertTrue(Math.abs(f - o.v.c) < 0.000001);
-				assertTrue(Math.abs(f - o.v.d) < 0.000001);
-				assertTrue(Math.abs(f - o.v.tx) < 0.000001);
-				assertTrue(Math.abs(f - o.v.ty) < 0.000001);
-			}
-			assertNotEquals(s, o.v);
-			assertNotEquals(t, o.v);
-		}
-		
-	} // end of class AnimationTests
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.tests/flare/tests/DataIOTests.as b/grade/report/visual/flare_visualization/flare/flare.tests/flare/tests/DataIOTests.as
deleted file mode 100644
index fd0ce1aa9d..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.tests/flare/tests/DataIOTests.as
+++ /dev/null
@@ -1,146 +0,0 @@
-package flare.tests
-{
-	import flare.data.DataSet;
-	import flare.data.converters.GraphMLConverter;
-	import flare.data.converters.JSONConverter;
-	import flare.vis.data.Data;
-	
-	import flash.utils.ByteArray;
-	
-	import unitest.TestCase;
-	
-	public class DataIOTests extends TestCase
-	{
-		public function DataIOTests()
-		{
-			addTest("testJSONConverter");
-			addTest("testGraphMLConverter");
-		}
-		
-		// --------------------------------------------------------------------
-		
-		public function testJSONConverter():void
-		{
-			var jc:JSONConverter = new JSONConverter();
-			var data:Array = jc.parse(JSON, null);
-			
-			assertEquals(DATA.length, data.length);
-			for (var i:int=0; i<DATA.length; ++i) {
-				for (var name:String in DATA[i]) {
-					assertEquals(DATA[i][name], data[i][name]);
-				}
-			}
-		}
-		
-		private static const DATA:Array = [
-			{id:1, cat:"a", val:10, b:true},
-			{id:2, cat:"a", val:20, b:true},
-			{id:3, cat:"b", val:30, b:true},
-			{id:4, cat:"b", val:40, b:false},
-			{id:5, cat:"c", val:50, b:false},
-			{id:6, cat:"c", val:60, b:false}
-		];
-		
-		private static const JSON:String =
-			"[" +
-				"{\"id\":1,\"cat\":\"a\",\"val\":10,\"b\":true}," +
-				"{\"id\":2,\"cat\":\"a\",\"val\":20,\"b\":true}," +
-				"{\"id\":3,\"cat\":\"b\",\"val\":30,\"b\":true}," +
-				"{\"id\":4,\"cat\":\"b\",\"val\":40,\"b\":false}," +
-				"{\"id\":5,\"cat\":\"c\",\"val\":50,\"b\":false}," +
-				"{\"id\":6,\"cat\":\"c\",\"val\":60,\"b\":false}" +
-			"]";
-		
-		// --------------------------------------------------------------------
-		
-		public function testGraphMLConverter():void
-		{
-			var gmlc:GraphMLConverter = new GraphMLConverter();
-			var data:DataSet = gmlc.parse(GRAPHML);
-			var i:int;
-			
-			// test nodes
-			var nids:Array = ["n0", "n1", "n2", "n3", "n4", "n5"];
-			var colors:Array = ["green", "yellow", "blue", "red", "yellow", "turquoise"];
-			
-			assertEquals(nids.length, data.nodes.data.length);
-			for (i=0; i<nids.length; ++i) {
-				assertEquals(nids[i], data.nodes.data[i].id);
-				assertEquals(colors[i], data.nodes.data[i].color);
-			}
-			
-			// test edges
-			var eids:Array = ["e0", "e1", "e2", "e3", "e4", "e5", "e6"];
-			var srcs:Array = ["n0", "n0", "n1", "n3", "n2", "n3", "n5"];
-			var trgs:Array = ["n2", "n1", "n3", "n2", "n4", "n5", "n4"];
-			var wgts:Array = [1.0, 1.0, 2.0, null, null, null, 1.1];
-			
-			assertEquals(7, data.edges.data.length);
-			for (i=0; i<eids.length; ++i) {
-				assertEquals(eids[i], data.edges.data[i].id);
-				assertEquals(srcs[i], data.edges.data[i].source);
-				assertEquals(trgs[i], data.edges.data[i].target);
-				assertEquals(wgts[i], data.edges.data[i].weight);
-				assertEquals(false, data.edges.data[i].directed);
-			}
-			
-			// read in graphml, write graph data back to xml
-			var out:ByteArray = gmlc.write(data) as ByteArray;
-			out.position = 0;
-			var s1:String = out.readUTFBytes(out.length);
-			
-			// now do a round-trip comparison test
-			out = gmlc.write(gmlc.parse(XML(s1))) as ByteArray;
-			out.position = 0;
-			var s2:String = out.readUTFBytes(out.length);
-			
-			assertEquals(s1, s2);
-			
-			// finally, do a test of data construction
-			var d:Data = Data.fromDataSet(data);
-			assertEquals(data.nodes.data.length, d.nodes.size);
-			assertEquals(data.edges.data.length, d.edges.size);
-		}
-		
-		private static const GRAPHML:XML =
-			<graphml>
-			  <key id="d0" for="node" attr.name="color" attr.type="string">
-			  	<default>yellow</default>
-			  </key>
-			  <key id="d1" for="edge" attr.name="weight" attr.type="double"/>
-			  <graph id="G" edgedefault="undirected">
-			    <node id="n0">
-			      <data key="d0">green</data>
-			    </node>
-			    <node id="n1"/>
-			    <node id="n2">
-			      <data key="d0">blue</data>
-			    </node>
-			    <node id="n3">
-			      <data key="d0">red</data>
-			    </node>
-			    <node id="n4"/>
-			    <node id="n5">
-			      <data key="d0">turquoise</data>
-			    </node>
-			    <edge id="e0" source="n0" target="n2">
-			      <data key="d1">1.0</data>
-			    </edge>
-			    <edge id="e1" source="n0" target="n1">
-			      <data key="d1">1.0</data>
-			    </edge>
-			    <edge id="e2" source="n1" target="n3">
-			      <data key="d1">2.0</data>
-			    </edge>
-			    <edge id="e3" source="n3" target="n2"/>
-			    <edge id="e4" source="n2" target="n4"/>
-			    <edge id="e5" source="n3" target="n5"/>
-			    <edge id="e6" source="n5" target="n4">
-			      <data key="d1">1.1</data>
-			    </edge>
-			  </graph>
-			</graphml>;
-
-		
-	} // end of class DataIOTests
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.tests/flare/tests/DataTests.as b/grade/report/visual/flare_visualization/flare/flare.tests/flare/tests/DataTests.as
deleted file mode 100644
index 0f981439f9..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.tests/flare/tests/DataTests.as
+++ /dev/null
@@ -1,201 +0,0 @@
-package flare.tests
-{
-	import flare.vis.data.Data;
-	import flare.vis.data.EdgeSprite;
-	import flare.vis.data.NodeSprite;
-	import flare.vis.util.Filters;
-	import unitest.TestCase;
-	
-	public class DataTests extends TestCase
-	{
-		public function DataTests()
-		{
-			addTest("createNodes");
-			addTest("createEdges");
-			addTest("containsNodes");
-			addTest("containsEdges");
-			addTest("removeNodes");
-			addTest("removeEdges");
-			addTest("createWithDefaults");
-			addTest("visit");
-		}
-		
-		// --------------------------------------------------------------------
-		
-		private static const N:int = 100;
-		private var data:Data;
-		
-		public function createNodes():void
-		{
-			data = new Data();
-			for (var i:uint=0; i<N; ++i) {
-				data.addNode({id:i});
-				assertEquals(data.nodes.size, i+1);
-			}
-		}
-		
-		public function createEdges():void
-		{
-			data = new Data();
-			for (var i:uint=0; i<N; ++i) {
-				data.addNode({id:i});
-				assertEquals(data.nodes.size, i+1);
-					
-				if (i > 0) {
-					var s:NodeSprite = data.nodes[i-1];
-					var t:NodeSprite = data.nodes[i];
-					var e:EdgeSprite = data.addEdgeFor(s, t);
-					assertEquals(data.edges.size, i);
-					assertEquals(e.source, s);
-					assertEquals(e.target, t);
-				}
-			}
-		}
-		
-		public function createWithDefaults():void
-		{
-			var _x:Number = 10, _y:Number = 20, _lw:Number = 3;
-			var _na:Number = 1, _ea:Number = 0, _t:String = "hello";
-			data = new Data();
-			data.nodes.setDefaults({x:_x, y:_y});
-			data.edges.setDefaults({lineWidth: _lw});
-			data.nodes.setDefault("alpha", _na);
-			data.nodes.setDefault("props.temp", _t);
-			data.edges.setDefault("alpha", _ea);
-
-			
-			var prev:NodeSprite = null, curr:NodeSprite;
-			for (var i:uint=0; i<10; ++i) {
-				curr = data.addNode({id:i});
-				if (prev != null) data.addEdgeFor(prev, curr);
-				prev = curr;
-			}
-			
-			for (i=0; i<data.nodes.size; ++i) {
-				curr = data.nodes[i];
-				assertEquals(_x, curr.x);
-				assertEquals(_y, curr.y);
-				assertEquals(_t, curr.props.temp);
-				assertEquals(_na, curr.alpha);
-			}
-			for (i=0; i<data.edges.size; ++i) {
-				var e:EdgeSprite = data.edges[i];
-				assertEquals(_lw, e.lineWidth);
-				assertEquals(_ea, e.alpha);
-			}
-			
-			// test default removal
-			data.nodes.removeDefault("props.temp");
-			data.edges.removeDefault("alpha");
-			curr = data.addNode();
-			e = data.addEdgeFor(prev, curr);
-			assertNotEquals(_t, curr.props.temp);
-			assertNotEquals(_ea, e.alpha);
-		}
-		
-		public function containsNodes():void
-		{
-			createNodes();
-			for (var i:uint=0; i<N; ++i) {
-				assertTrue(data.contains(data.nodes[i]));
-				assertTrue(data.nodes.contains(data.nodes[i]));
-			}
-			data.nodes.visit(function(n:NodeSprite):void {
-				assertTrue(data.contains(n));
-				assertTrue(data.nodes.contains(n));
-			});
-		}
-		
-		public function containsEdges():void
-		{
-			createEdges();
-			for (var i:uint=0; i<data.edges.size; ++i) {
-				assertTrue(data.contains(data.edges[i]));
-				assertTrue(data.edges.contains(data.edges[i]));
-			}
-			data.edges.visit(function(e:EdgeSprite):void {
-				assertTrue(data.contains(e));
-				assertTrue(data.edges.contains(e));
-			});
-		}
-		
-		public function removeNodes():void
-		{
-			var n:NodeSprite;
-			
-			createNodes();
-			for (var i:uint=N; --i>=0;) {
-				n = data.nodes[i];
-				data.removeNode(n);
-				assertEquals(i, data.nodes.size);
-				assertFalse(data.nodes.contains(n));
-			}
-			
-			createNodes(); i=N;
-			data.nodes.visit(function(n:NodeSprite):void {
-				data.removeNode(n); --i;
-				assertEquals(data.nodes.size, i);
-			});
-			assertEquals(0, i);
-			
-			createEdges(); i=N;
-			data.nodes.visit(function(n:NodeSprite):void {
-				data.removeNode(n); --i;
-				assertEquals(data.nodes.size, i);
-			});
-			assertEquals(0, i);
-			assertEquals(0, data.edges.size);
-		}
-		
-		public function removeEdges():void
-		{
-			var e:EdgeSprite;
-						
-			createEdges();
-			for (var i:uint=N-1; --i>=0;) {
-				e = data.edges[i];
-				data.removeEdge(e);
-				assertEquals(i, data.edges.size);
-				assertFalse(data.edges.contains(e));
-			}
-			assertEquals(N, data.nodes.size);
-			
-			createEdges(); i=N-1;
-			data.edges.visit(function(e:EdgeSprite):void {
-				data.removeEdge(e); --i;
-				assertEquals(data.edges.size, i);
-			});
-			assertEquals(0, i);
-			assertEquals(0, data.edges.size);
-			assertEquals(N, data.nodes.size);
-		}
-		
-		public function visit():void
-		{
-			createEdges();
-			
-			var id10:Function = function(o:Object):Boolean {
-				return o.data.id >= 10;
-			};
-			var counter:Function = function(o:Object):void {
-				++count;
-			};
-			var count:int = 0;
-			
-			// visit nodes, count filtered on id
-			data.nodes.visit(counter, false, id10);
-			assertEquals(data.nodes.size-10, count);
-			
-			// visit all, count nodes only
-			count = 0;
-			data.visit(counter, Data.ALL, Filters.isNodeSprite);
-			assertEquals(data.nodes.size, count);
-			
-			// visit all, count edges only
-			count = 0;
-			data.visit(counter, Data.ALL, Filters.isEdgeSprite);
-			assertEquals(data.edges.size, count);
-		}
-		
-	} // end of class DataTests
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.tests/flare/tests/ExpressionTests.as b/grade/report/visual/flare_visualization/flare/flare.tests/flare/tests/ExpressionTests.as
deleted file mode 100644
index 930839d065..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.tests/flare/tests/ExpressionTests.as
+++ /dev/null
@@ -1,321 +0,0 @@
-package flare.tests
-{
-	import flare.query.And;
-	import flare.query.Arithmetic;
-	import flare.query.Comparison;
-	import flare.query.Expression;
-	import flare.query.If;
-	import flare.query.Literal;
-	import flare.query.Or;
-	import flare.query.Query;
-	import flare.query.Range;
-	import flare.query.Variable;
-	import flare.query.Xor;
-	import flare.query.methods.*;
-	
-	import unitest.TestCase;
-
-	public class ExpressionTests extends TestCase
-	{
-		public function ExpressionTests() {
-			addTest("testParse");
-			addTest("testExpressions");
-			addTest("testExpressionMethods");
-			addTest("testQuery");
-		}
-		
-		public function testParse():void
-		{
-			assertTrue(Expression.expr(true) is Literal);
-			assertTrue(Expression.expr(false) is Literal);
-			assertTrue(Expression.expr(1) is Literal);
-			assertTrue(Expression.expr(new Date()) is Literal);
-			assertTrue(Expression.expr("'a'") is Literal);
-			assertTrue(Expression.expr("a") is Variable);
-			assertTrue(Expression.expr("{a}") is Variable);
-			
-			var s:String = "a";
-			assertTrue(_(s) is Literal);
-			assertEquals("a", _(s).eval());
-			assertTrue($(s) is Variable);
-			assertEquals("a", $(s).name);
-			assertTrue(Expression.expr(s) is Variable);
-			assertTrue(Expression.expr(_(s)) is Literal);
-			assertTrue(Expression.expr($(s)) is Variable);
-		}
-		
-		// test variables
-		private var t1:Date = new Date(1979,5,15);
-		private var t2:Date = new Date(1982,2,19);
-		private var _lt:Expression;
-		private var _gt:Expression;
-		private var _eq:Expression;
-		private var _neq:Expression;
-		private var _lte:Expression;
-		private var _gte:Expression;
-		private var _add:Expression;
-		private var _sub:Expression;
-		private var _mul:Expression;
-		private var _div:Expression;
-		private var _mod:Expression;
-		private var _and:Expression;
-		private var _xor:Expression;
-		private var _or:Expression;
-		private var _if:Expression;
-		private var _range:Range;
-		private var _span:Range;
-		
-		private function _tests():Array
-		{
-			return [
-				// numbers
-				{expr:_lt,   input:{a:0,b:0}, result:false},
-				{expr:_gt,   input:{a:0,b:0}, result:false},
-				{expr:_eq,   input:{a:0,b:0}, result:true},
-				{expr:_neq,  input:{a:0,b:0}, result:false},
-				{expr:_lte,  input:{a:0,b:0}, result:true},
-				{expr:_gte,  input:{a:0,b:0}, result:true},
-				{expr:_lt,   input:{a:1,b:0}, result:false},
-				{expr:_gt,   input:{a:1,b:0}, result:true},
-				{expr:_eq,   input:{a:1,b:0}, result:false},
-				{expr:_neq,  input:{a:1,b:0}, result:true},
-				{expr:_lte,  input:{a:1,b:0}, result:false},
-				{expr:_gte,  input:{a:1,b:0}, result:true},
-				{expr:_lt,   input:{a:0,b:1}, result:true},
-				{expr:_gt,   input:{a:0,b:1}, result:false},
-				{expr:_eq,   input:{a:0,b:1}, result:false},
-				{expr:_neq,  input:{a:0,b:1}, result:true},
-				{expr:_lte,  input:{a:0,b:1}, result:true},
-				{expr:_gte,  input:{a:0,b:1}, result:false},
-				
-				{expr:_add,  input:{a:2,b:3}, result:5},
-				{expr:_sub,  input:{a:2,b:3}, result:-1},
-				{expr:_mul,  input:{a:2,b:3}, result:6},
-				{expr:_div,  input:{a:2,b:3}, result:2/3},
-				{expr:_mod,  input:{a:2,b:3}, result:2},
-				{expr:_add,  input:{a:3,b:2}, result:5},
-				{expr:_sub,  input:{a:3,b:2}, result:1},
-				{expr:_mul,  input:{a:3,b:2}, result:6},
-				{expr:_div,  input:{a:3,b:2}, result:1.5},
-				{expr:_mod,  input:{a:3,b:2}, result:1},
-				
-				{expr:_and,  input:{a:3,b:2}, result:true},
-				{expr:_and,  input:{a:0,b:2}, result:false},
-				{expr:_xor,  input:{a:3,b:2}, result:true},
-				{expr:_xor,  input:{a:1,b:1}, result:true},
-				{expr:_xor,  input:{a:0,b:0}, result:false},
-				{expr:_or,   input:{a:3,b:2}, result:true},
-				{expr:_or,   input:{a:0,b:0}, result:false},
-				
-				{expr:_if,   input:{a:2,b:3}, result:-1},
-				{expr:_if,   input:{a:3,b:3}, result:6},
-				
-				{expr:_range,input:{a:-2},    result:false},
-				{expr:_range,input:{a:-1},    result:true},
-				{expr:_range,input:{a:0},     result:true},
-				{expr:_range,input:{a:1},     result:true},
-				{expr:_range,input:{a:2},     result:false},
-				
-				// dates
-				{expr:_lt,   input:{a:t1,b:t2}, result:true},
-				{expr:_gt,   input:{a:t1,b:t2}, result:false},
-				{expr:_eq,   input:{a:t1,b:t2}, result:false},
-				{expr:_neq,  input:{a:t1,b:t2}, result:true},
-				{expr:_lte,  input:{a:t1,b:t2}, result:true},
-				{expr:_gte,  input:{a:t1,b:t2}, result:false},	
-				{expr:_lt,   input:{a:t1,b:t1}, result:false},
-				{expr:_gt,   input:{a:t1,b:t1}, result:false},
-				{expr:_eq,   input:{a:t1,b:t1}, result:true},
-				{expr:_neq,  input:{a:t1,b:t1}, result:false},
-				{expr:_lte,  input:{a:t1,b:t1}, result:true},
-				{expr:_gte,  input:{a:t1,b:t1}, result:true},
-				{expr:_span, input:{a:new Date(1978,1)}, result:false},
-				{expr:_span, input:{a:t1},               result:true},
-				{expr:_span, input:{a:new Date(1980,1)}, result:true},
-				{expr:_span, input:{a:t2},               result:true},
-				{expr:_span, input:{a:new Date(1990,1)}, result:false},
-				
-				// strings
-				{expr:_lt,   input:{a:"a",b:"b"}, result:true},
-				{expr:_gt,   input:{a:"a",b:"b"}, result:false},
-				{expr:_eq,   input:{a:"a",b:"b"}, result:false},
-				{expr:_neq,  input:{a:"a",b:"b"}, result:true},
-				{expr:_lte,  input:{a:"a",b:"b"}, result:true},
-				{expr:_gte,  input:{a:"a",b:"b"}, result:false},	
-				{expr:_lt,   input:{a:"a",b:"a"}, result:false},
-				{expr:_gt,   input:{a:"a",b:"a"}, result:false},
-				{expr:_eq,   input:{a:"a",b:"a"}, result:true},
-				{expr:_neq,  input:{a:"a",b:"a"}, result:false},
-				{expr:_lte,  input:{a:"a",b:"a"}, result:true},
-				{expr:_gte,  input:{a:"a",b:"a"}, result:true},
-			];
-		}
-		
-		private function _runTests():void
-		{
-			var tests:Array = _tests();
-			for (var i:uint=0; i<tests.length; ++i) {
-				var e:Expression = tests[i].expr;
-				var val:Object = e.eval(tests[i].input);
-				assertEquals(tests[i].result, val, i+":"+e.toString());
-			}
-		}
-		
-		public function testExpressions():void 
-		{
-			var l:Variable = new Variable("a");
-			var r:Variable = new Variable("b");
-			
-			_lt  = Comparison.LessThan(l,r);
-			_gt  = Comparison.GreaterThan(l,r);
-			_eq  = Comparison.Equal(l,r);
-			_neq = Comparison.NotEqual(l,r);
-			_lte = Comparison.LessThanOrEqual(l,r);
-			_gte = Comparison.GreaterThanOrEqual(l,r);
-			_add = Arithmetic.Add(l, r);
-			_sub = Arithmetic.Subtract(l, r);
-			_mul = Arithmetic.Multiply(l, r);
-			_div = Arithmetic.Divide(l, r);
-			_mod = Arithmetic.Mod(l, r);
-			_and = new And(Comparison.GreaterThan(_mul, _add),
-						   Comparison.GreaterThan(_add, _sub));
-			_xor = new Xor(Comparison.GreaterThan(_add, _mul),
-						   Comparison.GreaterThan(_mul, _add));
-			_or  = new Or(Comparison.GreaterThan(_add, _mul),
-						  Comparison.GreaterThan(_mul, _add));
-			_if = new If(_eq, _add, _sub);
-			_range = new Range(new Literal(-1), new Literal(+1), l);
-			_span  = new Range(new Literal(t1), new Literal(t2), l);
-
-			_runTests();
-		}
-		
-		public function testExpressionMethods():void 
-		{
-			var a:Variable = $("a");
-			var b:Variable = $("b");
-			
-			_lt  = lt(a, b);
-			_gt  = gt(a, b);
-			_eq  = eq(a, b);
-			_neq = neq(a, b);
-			_lte = lte(a, b);
-			_gte = gte(a, b);
-			_add = add(a, b);
-			_sub = sub(a, b);
-			_mul = mul(a, b);
-			_div = div(a, b);
-			_mod = mod(a, b);
-			_and = and(gt(_mul, _add), gt(_add, _sub));
-			_xor = xor(gt(_add, _mul), gt(_mul, _add));	
-			_or  = or(gt(_add, _mul), gt(_mul, _add));
-			_if = iff(_eq, _add, _sub);
-			_range = range(-1, +1, a);
-			_span  = range(t1, t2, a);
-			
-			_runTests();
-		}
-		
-		public function testQuery():void
-		{
-			var data:Array = [
-				{val:4, cat:"a"},
-				{val:4, cat:"a"},
-				{val:4, cat:"a"},
-				{val:3, cat:"b"},
-				{val:3, cat:"b"},
-				{val:3, cat:"b"},
-				{val:2, cat:"c"},
-				{val:2, cat:"c"},
-				{val:2, cat:"c"},
-				{val:1, cat:"d"}
-			];
-			
-			var r:Array;
-			
-			r = select({count:count("cat")}).eval(data);
-			assertEquals(1, r.length);
-			assertEquals(10, r[0].count);
-			
-			r = select({distinct:distinct("cat")}).eval(data);
-			assertEquals(1, r.length);
-			assertEquals(4, r[0].distinct);
-			
-			r = select({min:min("val")}).eval(data);
-			assertEquals(1, r.length);
-			assertEquals(1, r[0].min);
-			
-			r = select({max:max("val")}).eval(data);
-			assertEquals(1, r.length);
-			assertEquals(4, r[0].max);
-			
-			r = select({avg:average("val")}).eval(data);
-			assertEquals(1, r.length);
-			assertEquals(2.8, r[0].avg);
-			
-			r = select({sum:sum("val")}).eval(data);
-			assertEquals(1, r.length);
-			assertEquals(28, r[0].sum);
-			
-			r = select({sum:sum("val")})
-				.where(eq("cat", _("a"))) // use a as literal
-				.eval(data);
-			assertEquals(1, r.length);
-			assertEquals(12, r[0].sum);
-			
-			r = select({sum:sum("val")})
-				.where(eq("cat", $("a"))) // use a as variable
-				.eval(data);
-			assertEquals(0, r.length);
-			
-			r = select("cat", {sum:sum("val")})
-				.groupby("cat")
-				.eval(data);
-			assertEquals( 4, r.length);
-			assertEquals(12, r[0].sum); assertEquals("a", r[0].cat);
-			assertEquals( 9, r[1].sum); assertEquals("b", r[1].cat);
-			assertEquals( 6, r[2].sum); assertEquals("c", r[2].cat);
-			assertEquals( 1, r[3].sum); assertEquals("d", r[3].cat);
-			
-			var q:Query = where(or(eq("cat", _("a")),
-			                       eq("cat", _("b"))));
-			r = q.eval(data);
-			assertEquals(6, r.length);
-			
-			r = q.orderby("cat", false).eval(data);
-			assertEquals(6, r.length);
-			assertEquals("b", r[0].cat);
-			assertEquals("a", r[5].cat);
-			
-			r = where(eq(func("sqrt","val"), 2)).eval(data);
-			assertEquals(3, r.length);
-			assertEquals("a", r[0].cat);
-			
-			// -----
-			
-			data = [
-	 			{cat:"a", val:1}, {cat:"a", val:2},
-	 			{cat:"b", val:3}, {cat:"b", val:4},
-	 			{cat:"c", val:5}, {cat:"c", val:6},
-	 			{cat:"d", val:7}, {cat:"d", val:8}
-	 		];
-	 
-	 		r = orderby("cat", true, "val", false).eval(data);
-	 		assertEquals(8, r.length);
-	 		assertEquals(2, r[0].val); assertEquals(1, r[1].val); 
-	 		assertEquals(4, r[2].val); assertEquals(3, r[3].val); 
-	 		assertEquals(6, r[4].val); assertEquals(5, r[5].val); 
-	 		assertEquals(8, r[6].val); assertEquals(7, r[7].val); 
-	 
-	 		r = select("cat", {sum:sum("val")}) // category + sum of values
-	            .where(neq("cat", _("d")))      // exclude category "d"
-	            .groupby("cat")                 // group by category
-	            .eval(data);                    // evaluate with data array
-	  		assertEquals( 3, r.length);
-	  		assertEquals("a", r[0].cat); assertEquals( 3, r[0].sum);
-	  		assertEquals("b", r[1].cat); assertEquals( 7, r[1].sum);
-	  		assertEquals("c", r[2].cat); assertEquals(11, r[2].sum);
-		}
-		
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.tests/flare/tests/SortTests.as b/grade/report/visual/flare_visualization/flare/flare.tests/flare/tests/SortTests.as
deleted file mode 100644
index 6646e5242b..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.tests/flare/tests/SortTests.as
+++ /dev/null
@@ -1,115 +0,0 @@
-package flare.tests
-{
-	import flare.util.Sort;
-	import flash.display.Sprite;
-	import flash.display.Shape;
-	import flash.display.DisplayObject;
-	import unitest.TestCase;
-
-	public class SortTests extends TestCase
-	{
-		public function SortTests() {
-			addTest("testSort");
-			addTest("testSortDisplayChildren");
-		}
-		
-		// --------------------------------------------------------------------
-
-		private var a:Object = {x:1, y:1, z:1};
-		private var b:Object = {x:2, y:1, z:1};
-		private var c:Object = {x:3, y:2, z:1};
-		private var d:Object = {x:4, y:2, z:1};
-		private var e:Object = {x:5, y:3, z:2};
-		private var f:Object = {x:6, y:3, z:2};
-		private var g:Object = {x:7, y:4, z:2};
-		private var h:Object = {x:8, y:4, z:2};
-		
-		public function testSort():void
-		{
-			var tests:Array = [
-				{
-				 items:[a, b, c, d, e, f, g, h],
-				 check:[h, g, f, e, d, c, b, a],
-				 sort: Sort.sortOn("x", false)
-				},
-				{
-				 items:[a, b, c, d, e, f, g, h],
-				 check:[g, h, e, f, c, d, a, b],
-				 sort: Sort.sortOn("y", false)
-				},
-				{
-				 items:[a, b, c, d, e, f, g, h],
-				 check:[e, f, g, h, a, b, c, d],
-				 sort: Sort.sorter(["z", false, "x", true])
-				},
-				{
-				 items:[a, b, c, d, e, f, g, h],
-				 check:[b, a, d, c, f, e, h, g],
-				 sort: Sort.sorter(["y", "x", false])
-				},
-				{
-				 items:[a, b, c, d, e, f, g, h],
-				 check:[a, b, c, d, e, f, g, h],
-				 sort: Sort.sorter(["z", "y", "x"])
-				},
-				{
-				 items:[a, b, c, d, e, f, g, h],
-				 check:[g, h, e, f, c, d, a, b],
-				 sort: Sort.sorter(["z", false, "y", false, "x"])
-				},
-			];
-			
-			for each (var test:Object in tests) {
-				test.items.sort(test.sort);
-				for (var i:int=0; i<test.items.length; ++i)
-					assertEquals(test.check[i], test.items[i]);
-			}
-		}
-		
-		public function testSortDisplayChildren():void
-		{
-			var p:Sprite = new Sprite();
-			var sa:Shape = new Shape(); sa.x = a.x; sa.y = a.y;
-			var sb:Shape = new Shape(); sb.x = b.x; sb.y = b.y;
-			var sc:Shape = new Shape(); sc.x = c.x; sc.y = c.y;
-			var sd:Shape = new Shape(); sd.x = d.x; sd.y = d.y;
-			var se:Shape = new Shape(); se.x = e.x; se.y = e.y;
-			var sf:Shape = new Shape(); sf.x = f.x; sf.y = f.y;
-			var sg:Shape = new Shape(); sg.x = g.x; sg.y = g.y;
-			var sh:Shape = new Shape(); sh.x = h.x; sh.y = h.y;
-			
-			var tests:Array = [
-				{
-				 items:[sa, sb, sc, sd, se, sf, sg, sh],
-				 check:[sh, sg, sf, se, sd, sc, sb, sa],
-				 sort: Sort.sortOn("x", false)
-				},
-				{
-				 items:[sa, sb, sc, sd, se, sf, sg, sh],
-				 check:[sg, sh, se, sf, sc, sd, sa, sb],
-				 sort: Sort.sortOn("y", false)
-				},
-				{
-				 items:[sa, sb, sc, sd, se, sf, sg, sh],
-				 check:[sb, sa, sd, sc, sf, se, sh, sg],
-				 sort: Sort.sorter(["y", "x", false])
-				}
-			];
-			
-			for each (var test:Object in tests) {
-				// clear children
-				for (var i:int=p.numChildren; --i>=0;)
-					p.removeChildAt(i);
-				// add children
-				for (i=0; i<test.items.length; ++i)
-					p.addChild(test.items[i]);
-				// sort
-				Sort.sortChildren(p, test.sort);
-				// check result
-				for (i=0; i<test.items.length; ++i)
-					assertEquals(test.check[i], p.getChildAt(i));
-			}
-		}
-		
-	} // end of class SortTests
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.tests/flare/tests/StringFormatTests.as b/grade/report/visual/flare_visualization/flare/flare.tests/flare/tests/StringFormatTests.as
deleted file mode 100644
index fb6f17102a..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.tests/flare/tests/StringFormatTests.as
+++ /dev/null
@@ -1,142 +0,0 @@
-package flare.tests
-{
-	import flare.util.Strings;
-	import unitest.TestCase;
-	
-	public class StringFormatTests extends TestCase
-	{
-		public function StringFormatTests() {
-			addTest("testNumberFormatting");
-			addTest("testDateTimeFormatting");
-		}
-		
-		private function run_tests(tests:Array):void {
-			var pass:int, fail:int, i:int, s:String, t:Object, b:Boolean;
-			for (pass=fail=i=0; i<tests.length; ++i) {
-				t = tests[i];
-				s = Strings.format("{0"+t.format+"}", t.input);
-				assertEquals(t.result, s, t.format);
-			}
-		}
-
-		public function testNumberFormatting():void
-		{
-			// -- Number Formatting ----------------------------
-			var d:Number = 12345.9876543210;
-			var c:Number = 12345.30100;
-			var num_tests:Array = [
-				// custom formatters
-				{format:":##;(##)", input:-1234, result:"(1234)"},
-				{format:":##", input:1234, result:"1234"},
-				{format:":00", input:1234, result:"1234"},
-				{format:":#####", input:123, result:"123"},
-				{format:":00000", input:123, result:"00123"},
-				{format:":(###) ### - ####", input:1234567890, result:"(123) 456 - 7890"},
-				{format:":#.##", input:1.2, result:"1.2"},
-				{format:":0.00", input:1.2, result:"1.20"},
-				{format:":00.00", input:1.2, result:"01.20"},
-				{format:":#,#", input:1234567890, result:"1,234,567,890"},
-				{format:":#,,", input:1234567890, result:"1235"},
-				{format:":#,,,", input:1234567890, result:"1"},
-				{format:":#,##0,,", input:1234567890, result:"1,235"},
-				{format:":#0.##%", input:0.086, result:"8.6%"},
-				{format:":0.###E+0", input:86000, result:"8.6E+4"},
-				{format:":0.###E+000", input:86000, result:"8.6E+004"},
-				{format:":0.###E-000", input:86000, result:"8.6E004"},
-				{format:":[##-##-##]", input:123456, result:"[12-34-56]"},
-				{format:":##;(##)", input:1234, result:"1234"},
-				{format:":0000000", input:c, result:"0012345"},
-				{format:":#######", input:c, result:"12345"},
-				{format:":0000000.0000#", input:c, result:"0012345.3010"},
-				{format:":#######.#####", input:c, result:"12345.301"},
-				{format:":00000000%", input:c, result:"01234530%"},
-				{format:":########%", input:c, result:"1234530%"},
-				{format:":0.00e00", input:c, result:"1.23e04"},
-				{format:":#.##e00", input:c, result:"1.23e04"},
-				{format:":0.e+00.-00", input:c, result:"1.e+04-23"},
-				{format:":#.e+00.-##", input:c, result:"1.e+04-23"},
-				{format:":000,", input:c, result:"012"},
-				{format:":###,", input:c, result:"12"},
-				{format:":0,", input:c, result:"12"},
-				{format:":#,", input:c, result:"12"},
-				{format:",-8:#,", input:c, result:"12      "},
-				{format:",8:#,", input:c, result:"      12"},
-				{format:":00,000.00", input:c, result:"12,345.30"},
-				{format:":##,###.##", input:c, result:"12,345.3"},
-				{format:":0,0.00", input:c, result:"12,345.30"},
-				{format:":#,#.##", input:c, result:"12,345.3"},
-				{format:":$0;($0);Zero", input:123, result:"$123"},
-				{format:":$0;($0);Zero", input:-123, result:"($123)"},
-				{format:":$0;($0);Zero", input:0, result:"Zero"},
-				{format:":0000000", input:d, result:"0012346"},
-				{format:":#######", input:d, result:"12346"},
-				{format:":0000000.00", input:d, result:"0012345.99"},
-				{format:":#######.##", input:d, result:"12345.99"},
-				{format:":000.000e0,0%", input:32100.123, result:"321.001e42%"},
-	            {format:":000.000%", input:32100.123, result:"3210012.300%"},
-	            {format:":000%", input:32100.123, result:"3210012%"},
-	            {format:":0,0.0", input:32100.123, result:"32,100.1"},
-	            {format:":0", input:32100.123, result:"32100"},
-	            {format:":00", input:32100.123, result:"32100"},
-	            {format:":0,0000,0", input:32100123, result:"32,100,123"},
-	            {format:":00000,0,.000000", input:32100123.123456789, result:"032,100.123123"},
-	            {format:":###.###e#,#%", input:32100.123, result:"3210012.3e%"},
-	            {format:":0,000%", input:3210.01, result:"321,001%"},
-	            {format:":00%00", input:3210.01, result:"3210%01"},
-	            {format:":0.00e+0-00e0", input:123456789, result:"1.23e+8-45e7"},
-	            {format:":0.00e+", input:123456789, result:"123456789.00e+"},
-	            {format:":0.00e", input:123456789, result:"123456789.00e"},
-	            {format:":0ea.00e+00", input:123456789, result:"1ea.23e+08"},
-	            {format:":###e+00.00", input:123456789, result:"123e+06.46"},
-	            {format:":0.00e+0", input:123456789000000000, result:"1.23e+17"},
-	            {format:":0,0.0,0,,,", input:1234567.89, result:"1,234,567.89"},
-	            {format:":0,0-0-0,0.00", input:1234567.89, result:"1,234,-5-67.89"},
-	            {format:":###000", input:12345, result:"12345"},
-	            {format:":000###", input:12345, result:"012345"},
-	            {format:":0000000,00", input:12345, result:"000,012,345"},
-	            {format:":0.########e+0", input:1.234e56, result:"1.234e+56"},
-	            {format:":0.########e-0", input:4.321e-56, result:"4.321e-56"},
-	            {format:":0.0",input:7.1E-15, result:"0.0"},
-	            {format:":0.0",input:1+7.1E-15, result:"1.0"},
-	            // standard formatters
-	            {format:":c", input:12345, result:"$12,345.00"},
-	            {format:":C04", input:12345, result:"$12,345.0000"},
-	            {format:":d", input:12345, result:"12345"},
-	            {format:":D6", input:12345, result:"012345"},	            
-	            {format:":e", input:12345, result:"1.23e+4"},
-	            {format:":E", input:0.00012345, result:"1.23E-4"},
-	            {format:":e4", input:12345000000, result:"1.2345e+10"},
-	            {format:":f4", input:123.45, result:"123.4500"},
-	            {format:":F2", input:123.45, result:"123.45"},
-	            {format:":n", input:12345, result:"12,345.00"},
-	            {format:":N4", input:12345.0001, result:"12,345.0001"},
-	            {format:":x", input:255, result:"ff"},
-	            {format:":x4", input:255, result:"00ff"},
-	            {format:":X5", input:255, result:"000FF"},
-			];
-			run_tests(num_tests);
-		}		
-
-		public function testDateTimeFormatting():void
-		{			
-			// -- Date/Time Formatting -------------------------
-			var d1:Date = new Date(1979,5,15);
-			var d2:Date = new Date(1979,11,7,13,8,12,123);
-			var date_tests:Array = [
-				{format:":yyyy/MM/dd", input:d1, result:"1979/06/15"},
-				{format:":yy/MM/dd", input:d1, result:"79/06/15"},
-				{format:":yy/MM/dd", input:d2, result:"79/12/07"},
-				{format:":%h", input:d2, result:"1"},
-				{format:":d", input:d2, result:"12/07/1979"},
-				{format:":ddd MMMM d, yyyy", input:d2, result:"Fri December 7, 1979"},
-				{format:":MMM-dd", input:d2, result:"Dec-07"},
-				{format:":HH:mm:ss tt", input:d2, result:"13:08:12 PM"},
-				{format:":hh:mm:ss tt", input:d2, result:"01:08:12 PM"},
-				{format:":dddd h:mmt", input:d2, result:"Friday 1:08P"},
-				{format:":'Freaky' dddd \"the 13th\"", input:d2, result:"Freaky Friday the 13th"}
-			];
-			run_tests(date_tests);
-		}
-		
-	} // end of class StringFormatTests
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.tests/flare/tests/TreeTests.as b/grade/report/visual/flare_visualization/flare/flare.tests/flare/tests/TreeTests.as
deleted file mode 100644
index 47d8772468..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.tests/flare/tests/TreeTests.as
+++ /dev/null
@@ -1,177 +0,0 @@
-package flare.tests
-{
-	import flare.util.Property;
-	import flare.vis.data.Data;
-	import flare.vis.data.EdgeSprite;
-	import flare.vis.data.NodeSprite;
-	import flare.vis.data.Tree;
-	import flare.vis.util.TreeUtil;
-	import unitest.TestCase;
-	
-	public class TreeTests extends TestCase
-	{
-		public function TreeTests() {
-			addTest("bfsTest");
-			addTest("dfsTest");
-			addTest("mstTest");
-			addTest("bfsTwiceTest");
-		}
-		
-		// --------------------------------------------------------------------
-		
-		private var data:Data;
-		private var a:NodeSprite, b:NodeSprite, c:NodeSprite, d:NodeSprite,
-					e:NodeSprite, f:NodeSprite, g:NodeSprite;
-		private var ab:EdgeSprite, bc:EdgeSprite, cd:EdgeSprite, ae:EdgeSprite,
-					bf:EdgeSprite, cg:EdgeSprite, dg:EdgeSprite, ef:EdgeSprite,
-					fg:EdgeSprite;
-		
-		//  a--b--c--d
-		//  |  |  | /
-		//  e--f--g
-		protected override function setup():void
-		{
-			data = new Data();
-			a = data.addNode(); a.name = "a";
-			b = data.addNode(); b.name = "b";
-			c = data.addNode(); c.name = "c";
-			d = data.addNode(); d.name = "d";
-			e = data.addNode(); e.name = "e";
-			f = data.addNode(); f.name = "f";
-			g = data.addNode(); g.name = "g";
-			
-			ab = data.addEdgeFor(a, b); ab.name = "ab"; ab.data = {w:1};
-			bc = data.addEdgeFor(b, c); bc.name = "bc"; bc.data = {w:10};
-			cd = data.addEdgeFor(c, d); cd.name = "cd"; cd.data = {w:1};
-			ae = data.addEdgeFor(a, e); ae.name = "ae"; ae.data = {w:4};
-			bf = data.addEdgeFor(b, f); bf.name = "bf"; bf.data = {w:5};
-			cg = data.addEdgeFor(c, g); cg.name = "cg"; cg.data = {w:5};
-			dg = data.addEdgeFor(d, g); dg.name = "dg"; dg.data = {w:0.1};
-			ef = data.addEdgeFor(e, f); ef.name = "ef"; ef.data = {w:1};
-			fg = data.addEdgeFor(f, g); fg.name = "fg"; fg.data = {w:1};
-		}
-		
-		protected override function clean():void
-		{
-			data = null;
-			a=b=c=d=e=f=g=null;
-		}
-		
-		//  a--b  c--d
-		//  |       /
-		//  e--f--g
-		public function mstTest():void
-		{
-			var p:Property = new Property("data.w");
-			data.treeBuilder = TreeUtil.mstBuilder(p.getValue);
-			data.root = f;
-			var tree:Tree = data.tree;
-			
-			assertEquals(7, tree.nodes.size);
-			assertEquals(6, tree.edges.size);
-			assertEquals(f, tree.root);
-			assertEquals(f, e.parentNode);
-			assertEquals(f, g.parentNode);
-			assertEquals(e, a.parentNode);
-			assertEquals(a, b.parentNode);
-			assertEquals(g, d.parentNode);
-			assertEquals(d, c.parentNode);
-			assertTrue(tree.contains(ab),  "contains "+ab.name);
-			assertTrue(tree.contains(ae),  "contains "+ae.name);
-			assertTrue(tree.contains(ef),  "contains "+ef.name);
-			assertTrue(tree.contains(fg),  "contains "+fg.name);
-			assertTrue(tree.contains(dg),  "contains "+dg.name);
-			assertTrue(tree.contains(cd),  "contains "+cd.name);
-			assertFalse(tree.contains(bc), "!contains "+bc.name);
-			assertFalse(tree.contains(bf), "!contains "+bf.name);
-			assertFalse(tree.contains(cg), "!contains "+cg.name);
-		}
-		
-		//  a--b--c--d
-		//  |  |  |  
-		//  e  f  g
-		public function bfsTest():void
-		{
-			data.treeBuilder = TreeUtil.breadthFirstTree;
-			var tree:Tree = data.tree;
-
-			assertEquals(7, tree.nodes.size);
-			assertEquals(6, tree.edges.size);			
-			assertEquals(a, tree.root);
-			assertEquals(a, b.parentNode);
-			assertEquals(a, e.parentNode);
-			assertEquals(b, c.parentNode);
-			assertEquals(b, f.parentNode);
-			assertEquals(c, d.parentNode);
-			assertEquals(c, g.parentNode);
-			assertTrue(tree.contains(ab));
-			assertTrue(tree.contains(ae));
-			assertTrue(tree.contains(bc));
-			assertTrue(tree.contains(bf));
-			assertTrue(tree.contains(cd));
-			assertTrue(tree.contains(cg));
-			assertFalse(tree.contains(ef));
-			assertFalse(tree.contains(fg));
-			assertFalse(tree.contains(dg));
-		}
-		
-		// a-b-c-d-g-f-e
-		public function dfsTest():void
-		{
-			data.treeBuilder = TreeUtil.depthFirstTree;
-			var tree:Tree = data.tree;
-			
-			assertEquals(7, tree.nodes.size);
-			assertEquals(6, tree.edges.size);
-			assertEquals(a, tree.root);
-			assertEquals(a, b.parentNode);
-			assertEquals(b, c.parentNode);
-			assertEquals(c, d.parentNode);
-			assertEquals(d, g.parentNode);
-			assertEquals(g, f.parentNode);
-			assertEquals(f, e.parentNode);
-			assertTrue(tree.contains(ab));
-			assertTrue(tree.contains(bc));
-			assertTrue(tree.contains(cd));
-			assertTrue(tree.contains(dg));
-			assertTrue(tree.contains(fg));
-			assertTrue(tree.contains(ef));
-			assertFalse(tree.contains(ae));
-			assertFalse(tree.contains(bf));
-			assertFalse(tree.contains(cg));
-		}
-		
-		//  a--b--c--d
-		//  |  |  |  
-		//  e  f  g
-		public function bfsTwiceTest():void
-		{
-			data.treeBuilder = TreeUtil.breadthFirstTree;
-			data.root = c;
-			var tree:Tree = data.tree;
-				
-			data.root = a;
-			tree = data.tree;
-
-			assertEquals(7, tree.nodes.size);
-			assertEquals(6, tree.edges.size);			
-			assertEquals(a, tree.root);
-			assertEquals(a, b.parentNode);
-			assertEquals(a, e.parentNode);
-			assertEquals(b, c.parentNode);
-			assertEquals(b, f.parentNode);
-			assertEquals(c, d.parentNode);
-			assertEquals(c, g.parentNode);
-			assertTrue(tree.contains(ab));
-			assertTrue(tree.contains(ae));
-			assertTrue(tree.contains(bc));
-			assertTrue(tree.contains(bf));
-			assertTrue(tree.contains(cd));
-			assertTrue(tree.contains(cg));
-			assertFalse(tree.contains(ef));
-			assertFalse(tree.contains(fg));
-			assertFalse(tree.contains(dg));
-		}
-
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.tests/html-template/AC_OETags.js b/grade/report/visual/flare_visualization/flare/flare.tests/html-template/AC_OETags.js
deleted file mode 100644
index 2fb2fe9823..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.tests/html-template/AC_OETags.js
+++ /dev/null
@@ -1,275 +0,0 @@
-// Flash Player Version Detection - Rev 1.6
-// Detect Client Browser type
-// Copyright(c) 2005-2006 Adobe Macromedia Software, LLC. All rights reserved.
-var isIE  = (navigator.appVersion.indexOf("MSIE") != -1) ? true : false;
-var isWin = (navigator.appVersion.toLowerCase().indexOf("win") != -1) ? true : false;
-var isOpera = (navigator.userAgent.indexOf("Opera") != -1) ? true : false;
-
-function ControlVersion()
-{
-	var version;
-	var axo;
-	var e;
-
-	// NOTE : new ActiveXObject(strFoo) throws an exception if strFoo isn't in the registry
-
-	try {
-		// version will be set for 7.X or greater players
-		axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.7");
-		version = axo.GetVariable("$version");
-	} catch (e) {
-	}
-
-	if (!version)
-	{
-		try {
-			// version will be set for 6.X players only
-			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.6");
-			
-			// installed player is some revision of 6.0
-			// GetVariable("$version") crashes for versions 6.0.22 through 6.0.29,
-			// so we have to be careful. 
-			
-			// default to the first public version
-			version = "WIN 6,0,21,0";
-
-			// throws if AllowScripAccess does not exist (introduced in 6.0r47)		
-			axo.AllowScriptAccess = "always";
-
-			// safe to call for 6.0r47 or greater
-			version = axo.GetVariable("$version");
-
-		} catch (e) {
-		}
-	}
-
-	if (!version)
-	{
-		try {
-			// version will be set for 4.X or 5.X player
-			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.3");
-			version = axo.GetVariable("$version");
-		} catch (e) {
-		}
-	}
-
-	if (!version)
-	{
-		try {
-			// version will be set for 3.X player
-			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.3");
-			version = "WIN 3,0,18,0";
-		} catch (e) {
-		}
-	}
-
-	if (!version)
-	{
-		try {
-			// version will be set for 2.X player
-			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash");
-			version = "WIN 2,0,0,11";
-		} catch (e) {
-			version = -1;
-		}
-	}
-	
-	return version;
-}
-
-// JavaScript helper required to detect Flash Player PlugIn version information
-function GetSwfVer(){
-	// NS/Opera version >= 3 check for Flash plugin in plugin array
-	var flashVer = -1;
-	
-	if (navigator.plugins != null && navigator.plugins.length > 0) {
-		if (navigator.plugins["Shockwave Flash 2.0"] || navigator.plugins["Shockwave Flash"]) {
-			var swVer2 = navigator.plugins["Shockwave Flash 2.0"] ? " 2.0" : "";
-			var flashDescription = navigator.plugins["Shockwave Flash" + swVer2].description;
-			var descArray = flashDescription.split(" ");
-			var tempArrayMajor = descArray[2].split(".");			
-			var versionMajor = tempArrayMajor[0];
-			var versionMinor = tempArrayMajor[1];
-			var versionRevision = descArray[3];
-			if (versionRevision == "") {
-				versionRevision = descArray[4];
-			}
-			if (versionRevision[0] == "d") {
-				versionRevision = versionRevision.substring(1);
-			} else if (versionRevision[0] == "r") {
-				versionRevision = versionRevision.substring(1);
-				if (versionRevision.indexOf("d") > 0) {
-					versionRevision = versionRevision.substring(0, versionRevision.indexOf("d"));
-				}
-			}
-			var flashVer = versionMajor + "." + versionMinor + "." + versionRevision;
-		}
-	}
-	// MSN/WebTV 2.6 supports Flash 4
-	else if (navigator.userAgent.toLowerCase().indexOf("webtv/2.6") != -1) flashVer = 4;
-	// WebTV 2.5 supports Flash 3
-	else if (navigator.userAgent.toLowerCase().indexOf("webtv/2.5") != -1) flashVer = 3;
-	// older WebTV supports Flash 2
-	else if (navigator.userAgent.toLowerCase().indexOf("webtv") != -1) flashVer = 2;
-	else if ( isIE && isWin && !isOpera ) {
-		flashVer = ControlVersion();
-	}	
-	return flashVer;
-}
-
-// When called with reqMajorVer, reqMinorVer, reqRevision returns true if that version or greater is available
-function DetectFlashVer(reqMajorVer, reqMinorVer, reqRevision)
-{
-	versionStr = GetSwfVer();
-	if (versionStr == -1 ) {
-		return false;
-	} else if (versionStr != 0) {
-		if(isIE && isWin && !isOpera) {
-			// Given "WIN 2,0,0,11"
-			tempArray         = versionStr.split(" "); 	// ["WIN", "2,0,0,11"]
-			tempString        = tempArray[1];			// "2,0,0,11"
-			versionArray      = tempString.split(",");	// ['2', '0', '0', '11']
-		} else {
-			versionArray      = versionStr.split(".");
-		}
-		var versionMajor      = versionArray[0];
-		var versionMinor      = versionArray[1];
-		var versionRevision   = versionArray[2];
-
-        	// is the major.revision >= requested major.revision AND the minor version >= requested minor
-		if (versionMajor > parseFloat(reqMajorVer)) {
-			return true;
-		} else if (versionMajor == parseFloat(reqMajorVer)) {
-			if (versionMinor > parseFloat(reqMinorVer))
-				return true;
-			else if (versionMinor == parseFloat(reqMinorVer)) {
-				if (versionRevision >= parseFloat(reqRevision))
-					return true;
-			}
-		}
-		return false;
-	}
-}
-
-function AC_AddExtension(src, ext)
-{
-  if (src.indexOf('?') != -1)
-    return src.replace(/\?/, ext+'?'); 
-  else
-    return src + ext;
-}
-
-function AC_Generateobj(objAttrs, params, embedAttrs) 
-{ 
-    var str = '';
-    if (isIE && isWin && !isOpera)
-    {
-  		str += '<object ';
-  		for (var i in objAttrs)
-  			str += i + '="' + objAttrs[i] + '" ';
-  		for (var i in params)
-  			str += '><param name="' + i + '" value="' + params[i] + '" /> ';
-  		str += '></object>';
-    } else {
-  		str += '<embed ';
-  		for (var i in embedAttrs)
-  			str += i + '="' + embedAttrs[i] + '" ';
-  		str += '> </embed>';
-    }
-
-    document.write(str);
-}
-
-function AC_FL_RunContent(){
-  var ret = 
-    AC_GetArgs
-    (  arguments, ".swf", "movie", "clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"
-     , "application/x-shockwave-flash"
-    );
-  AC_Generateobj(ret.objAttrs, ret.params, ret.embedAttrs);
-}
-
-function AC_GetArgs(args, ext, srcParamName, classid, mimeType){
-  var ret = new Object();
-  ret.embedAttrs = new Object();
-  ret.params = new Object();
-  ret.objAttrs = new Object();
-  for (var i=0; i < args.length; i=i+2){
-    var currArg = args[i].toLowerCase();    
-
-    switch (currArg){	
-      case "classid":
-        break;
-      case "pluginspage":
-        ret.embedAttrs[args[i]] = args[i+1];
-        break;
-      case "src":
-      case "movie":	
-        args[i+1] = AC_AddExtension(args[i+1], ext);
-        ret.embedAttrs["src"] = args[i+1];
-        ret.params[srcParamName] = args[i+1];
-        break;
-      case "onafterupdate":
-      case "onbeforeupdate":
-      case "onblur":
-      case "oncellchange":
-      case "onclick":
-      case "ondblClick":
-      case "ondrag":
-      case "ondragend":
-      case "ondragenter":
-      case "ondragleave":
-      case "ondragover":
-      case "ondrop":
-      case "onfinish":
-      case "onfocus":
-      case "onhelp":
-      case "onmousedown":
-      case "onmouseup":
-      case "onmouseover":
-      case "onmousemove":
-      case "onmouseout":
-      case "onkeypress":
-      case "onkeydown":
-      case "onkeyup":
-      case "onload":
-      case "onlosecapture":
-      case "onpropertychange":
-      case "onreadystatechange":
-      case "onrowsdelete":
-      case "onrowenter":
-      case "onrowexit":
-      case "onrowsinserted":
-      case "onstart":
-      case "onscroll":
-      case "onbeforeeditfocus":
-      case "onactivate":
-      case "onbeforedeactivate":
-      case "ondeactivate":
-      case "type":
-      case "codebase":
-        ret.objAttrs[args[i]] = args[i+1];
-        break;
-      case "id":
-      case "width":
-      case "height":
-      case "align":
-      case "vspace": 
-      case "hspace":
-      case "class":
-      case "title":
-      case "accesskey":
-      case "name":
-      case "tabindex":
-        ret.embedAttrs[args[i]] = ret.objAttrs[args[i]] = args[i+1];
-        break;
-      default:
-        ret.embedAttrs[args[i]] = ret.params[args[i]] = args[i+1];
-    }
-  }
-  ret.objAttrs["classid"] = classid;
-  if (mimeType) ret.embedAttrs["type"] = mimeType;
-  return ret;
-}
-
-
diff --git a/grade/report/visual/flare_visualization/flare/flare.tests/html-template/deeplinking/deeplinking.css b/grade/report/visual/flare_visualization/flare/flare.tests/html-template/deeplinking/deeplinking.css
deleted file mode 100644
index 5275b55216..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.tests/html-template/deeplinking/deeplinking.css
+++ /dev/null
@@ -1,6 +0,0 @@
-/* This CSS stylesheet defines styles used by required elements in a DeepLinking application page */
-
-#ie_historyFrame { width: 0px; height: 0px; display:none }
-#firefox_anchorDiv { width: 0px; height: 0px; display:none }
-#safari_formDiv { width: 0px; height: 0px; display:none }
-#safari_rememberDiv { width: 0px; height: 0px; display:none }
diff --git a/grade/report/visual/flare_visualization/flare/flare.tests/html-template/deeplinking/deeplinking.js b/grade/report/visual/flare_visualization/flare/flare.tests/html-template/deeplinking/deeplinking.js
deleted file mode 100644
index 87a32b42fd..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.tests/html-template/deeplinking/deeplinking.js
+++ /dev/null
@@ -1,517 +0,0 @@
-DeepLinkingUtils = {
-	addEvent: function(elm, evType, fn, useCapture) {
-		useCapture = useCapture || false;
-		if (elm.addEventListener) {
-			elm.addEventListener(evType, fn, useCapture);
-			return true;
-		}
-		else if (elm.attachEvent) {
-			var r = elm.attachEvent('on' + evType, fn);
-			return r;
-		}
-		else {
-			elm['on' + evType] = fn;
-		}
-	}
-}
-
-DeepLinking = (function() {
-	// type of browser
-    var browser = {
-        ie: false, 
-        firefox: false, 
-        safari: false, 
-        opera: false, 
-        version: -1
-    };
-
-    // Default app state URL to use when no fragment ID present
-    var defaultHash = '';
-
-    // Last-known app state URL
-    var currentHref = document.location.href;
-
-    // Initial URL (used only by IE)
-    var initialHref = document.location.href;
-
-    // Initial URL (used only by IE)
-    var initialHash = document.location.hash;
-
-    // History frame source URL prefix (used only by IE)
-    var historyFrameSourcePrefix = 'deeplinking/historyFrame.html?';
-
-    // History maintenance (used only by Safari)
-    var currentHistoryLength = -1;
-
-    var historyHash = [];
-
-    var initialState = createState(initialHref, initialHref + '#' + initialHash, initialHash);
-
-    var backStack = [];
-    var forwardStack = [];
-
-	//UserAgent detection
-    var useragent = navigator.userAgent.toLowerCase();
-
-    if (useragent.indexOf("opera") != -1) {
-        browser.opera = true;
-    } else if (useragent.indexOf("msie") != -1) {
-        browser.ie = true;
-        browser.version = parseFloat(useragent.substring(useragent.indexOf('msie') + 4));
-    } else if (useragent.indexOf("safari") != -1) {
-        browser.safari = true;
-        browser.version = parseFloat(useragent.substring(useragent.indexOf('safari') + 7));
-    } else if (useragent.indexOf("gecko") != -1) {
-        browser.firefox = true;
-    }
-
-    // Accessor functions for obtaining specific elements of the page.
-    function getHistoryFrame()
-    {
-        return document.getElementById('ie_historyFrame');
-    }
-
-    function getAnchorElement()
-    {
-        return document.getElementById('firefox_anchorDiv');
-    }
-
-    function getFormElement()
-    {
-        return document.getElementById('safari_formDiv');
-    }
-
-	function getRememberElement()
-	{
-		return document.getElementById("safari_remember_field");
-	}
-
-    /* Get the Flash player object for performing ExternalInterface callbacks. */
-    function getPlayer() {
-        var player = null; /* AJH, needed?  = document.getElementById(getPlayerId()); */
-        
-        if (player == null) {
-            player = document.getElementsByTagName('object')[0];
-        }
-        
-        if (player == null || player.object == null) {
-            player = document.getElementsByTagName('embed')[0];
-        }
-
-        return player;
-    }
-
-    /* Get the current location hash excluding the '#' symbol. */
-    function getHash() {
-       // It would be nice if we could use document.location.hash here,
-       // but it's faulty sometimes.
-       var idx = document.location.href.indexOf('#');
-       return (idx >= 0) ? document.location.href.substr(idx+1) : '';
-    }
-
-    /* Get the current location hash excluding the '#' symbol. */
-    function setHash(hash) {
-       // It would be nice if we could use document.location.hash here,
-       // but it's faulty sometimes.
-       if (hash == '') hash = '#'
-       document.location.hash = hash;
-    }
-
-    function createState(baseUrl, newUrl, flexAppUrl) {
-        return { 'baseUrl': baseUrl, 'newUrl': newUrl, 'flexAppUrl': flexAppUrl, 'title': null };
-    }
-
-    /* Add a history entry to the browser.
-     *   baseUrl: the portion of the location prior to the '#'
-     *   newUrl: the entire new URL, including '#' and following fragment
-     *   flexAppUrl: the portion of the location following the '#' only
-     */
-    function addHistoryEntry(baseUrl, newUrl, flexAppUrl, copyToAddressBar) {
-
-        //delete all the history entries
-        forwardStack = [];
-
-        if (browser.ie) {
-            //Check to see if we are being asked to do a navigate for the first
-            //history entry, and if so ignore, because it's coming from the creation
-            //of the history iframe
-            if (flexAppUrl == defaultHash && document.location.href == initialHref && _ie_firstload) {
-                currentHref = initialHref;
-                return;
-            }
-            if ((!flexAppUrl || flexAppUrl == defaultHash) && _ie_firstload) {
-                newUrl = baseUrl + '#' + defaultHash;
-                flexAppUrl = defaultHash;
-            } else {
-                // for IE, tell the history frame to go somewhere without a '#'
-                // in order to get this entry into the browser history.
-                getHistoryFrame().src = historyFrameSourcePrefix + flexAppUrl;
-            }
-            if (copyToAddressBar) {
-                setHash(flexAppUrl);
-                //document.location.href = newUrl;
-            }
-        } else {
-
-            //ADR
-            if (backStack.length == 0 && initialState.flexAppUrl == flexAppUrl) {
-                initialState = createState(baseUrl, newUrl, flexAppUrl);
-            } else if(backStack.length > 0 && backStack[backStack.length - 1].flexAppUrl == flexAppUrl) {
-                backStack[backStack.length - 1] = createState(baseUrl, newUrl, flexAppUrl);
-            }
-
-            if (browser.safari) {
-                // for Safari, submit a form whose action points to the desired URL
-                if (browser.version <= 419.3) {
-                    var file = window.location.pathname.toString();
-                    file = file.substring(file.lastIndexOf("/")+1);
-                    getFormElement().innerHTML = '<form name="historyForm" action="'+file+'#' + flexAppUrl + '" method="GET"></form>';
-                    //get the current elements and add them to the form
-                    var qs = window.location.search.substring(1);
-                    var qs_arr = qs.split("&");
-                    for (var i = 0; i < qs_arr.length; i++) {
-                        var tmp = qs_arr[i].split("=");
-                        var elem = document.createElement("input");
-                        elem.type = "hidden";
-                        elem.name = tmp[0];
-                        elem.value = tmp[1];
-                        document.forms.historyForm.appendChild(elem);
-                    }
-                    document.forms.historyForm.submit();
-                } else {
-                    top.location.hash = flexAppUrl;
-                }
-                // We also have to maintain the history by hand for Safari
-                historyHash[history.length] = flexAppUrl;
-                _storeStates();
-            } else {
-                // Otherwise, write an anchor into the page and tell the browser to go there
-                addAnchor(flexAppUrl);
-                if (copyToAddressBar) {
-                    setHash(flexAppUrl);
-                }
-           }
-        }
-        backStack.push(createState(baseUrl, newUrl, flexAppUrl));
-    }
-
-    function _storeStates() {
-        if (browser.safari) {
-            getRememberElement().value = historyHash.join(",");
-        }
-    }
-
-    function handleBackButton() {
-        //The "current" page is always at the top of the history stack.
-        var current = backStack.pop();
-        if (!current) { return; }
-        var last = backStack[backStack.length - 1];
-        if (!last && backStack.length == 0){
-            last = initialState;
-        }
-        forwardStack.push(current);
-    }
-
-    function handleForwardButton() {
-        //summary: private method. Do not call this directly.
-
-        var last = forwardStack.pop();
-        if (!last) { return; }
-        backStack.push(last);
-    }
-
-    function handleArbitraryUrl() {
-        //delete all the history entries
-        forwardStack = [];
-    }
-
-    /* Called periodically to poll to see if we need to detect navigation that has occurred */
-    function checkForUrlChange() {
-
-        if (browser.ie) {
-            if (currentHref != document.location.href && currentHref + '#' != document.location.href) {
-                //This occurs when the user has navigated to a specific URL
-                //within the app, and didn't use browser back/forward
-                //IE seems to have a bug where it stops updating the URL it
-                //shows the end-user at this point, but programatically it
-                //appears to be correct.  Do a full app reload to get around
-                //this issue.
-                if (browser.version < 7) {
-                    currentHref = document.location.href;
-                    document.location.reload();
-                } else {
-                    //getHistoryFrame().src = historyFrameSourcePrefix + getHash();
-                }
-            }
-		}
-
-		if (browser.safari) {
-            // For Safari, we have to check to see if history.length changed.
-            if (currentHistoryLength >= 0 && history.length != currentHistoryLength) {
-				//alert("did change: " + history.length + ", " + historyHash.length + "|" + historyHash[history.length] + "|>" + historyHash.join("|"));
-                // If it did change, then we have to look the old state up
-                // in our hand-maintained array since document.location.hash
-                // won't have changed, then call back into BrowserManager.
-                currentHistoryLength = history.length;
-                var flexAppUrl = historyHash[currentHistoryLength];
-                if (flexAppUrl == '') {
-                    //flexAppUrl = defaultHash;
-                }
-                getPlayer().browserURLChange(flexAppUrl);
-                _storeStates();
-            }
-		}
-		if (browser.firefox) {
-            if (currentHref != document.location.href) {
-                var bsl = backStack.length;
-
-                var urlActions = {
-                    back: false, 
-                    forward: false, 
-                    set: false
-                }
-
-                if ((window.location.hash == initialHash || window.location.href == initialHref) && (bsl == 1)) {
-                    urlActions.back = true;
-                    // FIXME: could this ever be a forward button?
-                    // we can't clear it because we still need to check for forwards. Ugg.
-                    // clearInterval(this.locationTimer);
-                    handleBackButton();
-                }
-                
-                // first check to see if we could have gone forward. We always halt on
-                // a no-hash item.
-                if (forwardStack.length > 0) {
-                    if (forwardStack[forwardStack.length-1].flexAppUrl == getHash()) {
-                        urlActions.forward = true;
-                        handleForwardButton();
-                    }
-                }
-
-                // ok, that didn't work, try someplace back in the history stack
-                if ((bsl >= 2) && (backStack[bsl - 2])) {
-                    if (backStack[bsl - 2].flexAppUrl == getHash()) {
-                        urlActions.back = true;
-                        handleBackButton();
-                    }
-                }
-                
-                if (!urlActions.back && !urlActions.forward) {
-                    var foundInStacks = {
-                        back: -1, 
-                        forward: -1
-                    }
-
-                    for (var i = 0; i < backStack.length; i++) {
-                        if (backStack[i].flexAppUrl == getHash() && i != (bsl - 2)) {
-                            arbitraryUrl = true;
-                            foundInStacks.back = i;
-                        }
-                    }
-                    for (var i = 0; i < forwardStack.length; i++) {
-                        if (forwardStack[i].flexAppUrl == getHash() && i != (bsl - 2)) {
-                            arbitraryUrl = true;
-                            foundInStacks.forward = i;
-                        }
-                    }
-                    handleArbitraryUrl();
-                }
-
-                // Firefox changed; do a callback into BrowserManager to tell it.
-                currentHref = document.location.href;
-                var flexAppUrl = getHash();
-                if (flexAppUrl == '') {
-                    //flexAppUrl = defaultHash;
-                }
-                getPlayer().browserURLChange(flexAppUrl);
-            }
-        }
-        //setTimeout(checkForUrlChange, 50);
-    }
-
-    /* Write an anchor into the page to legitimize it as a URL for Firefox et al. */
-    function addAnchor(flexAppUrl)
-    {
-       if (document.getElementsByName(flexAppUrl).length == 0) {
-           getAnchorElement().innerHTML += "<a name='" + flexAppUrl + "'>" + flexAppUrl + "</a>";
-       }
-    }
-
-    var _initialize = function () {
-		if (browser.ie)
-		{
-            var scripts = document.getElementsByTagName('script');
-            for (var i = 0, s; s = scripts[i]; i++) {
-                if (s.src.indexOf("deeplinking.js") > -1) {
-                    var iframe_location = (new String(s.src)).replace("deeplinking.js", "historyFrame.html");
-                }
-            }
-			historyFrameSourcePrefix = iframe_location + "?";
-			var src = historyFrameSourcePrefix;
-
-            var iframe = document.createElement("iframe");
-            iframe.id = 'ie_historyFrame';
-            iframe.name = 'ie_historyFrame';
-            //iframe.src = historyFrameSourcePrefix;
-            document.body.appendChild(iframe);
-		}
-
-		if (browser.safari)
-		{
-			var rememberDiv = document.createElement("div");
-			rememberDiv.id = 'asafari_rememberDiv';
-			document.body.appendChild(rememberDiv);
-			rememberDiv.innerHTML = '<input type="text" id="safari_remember_field" style="width: 500px;">';
-
-			var formDiv = document.createElement("div");
-			formDiv.id = 'safari_formDiv';
-			document.body.appendChild(formDiv);
-
-            var reloader_content = document.createElement('div');
-            reloader_content.id = 'safarireloader';
-            var scripts = document.getElementsByTagName('script');
-            for (var i = 0, s; s = scripts[i]; i++) {
-                if (s.src.indexOf("deeplinking.js") > -1) {
-                    html = (new String(s.src)).replace(".js", ".html");
-                }
-            }
-            reloader_content.innerHTML = '<iframe id="safarireloader-iframe" src="about:blank" frameborder="no" scrolling="no"></iframe>';
-            document.body.appendChild(reloader_content);
-            reloader_content.style.position = 'absolute';
-            reloader_content.style.left = reloader_content.style.top = '-9999px';
-            iframe = reloader_content.getElementsByTagName('iframe')[0];
-
-			if (document.getElementById("safari_remember_field").value != "" ) {
-				historyHash = document.getElementById("safari_remember_field").value.split(",");
-			}
-
-		}
-
-		if (browser.firefox)
-		{
-			var anchorDiv = document.createElement("div");
-			anchorDiv.id = 'firefox_anchorDiv';
-			document.body.appendChild(anchorDiv);
-		}
-        
-        //setTimeout(checkForUrlChange, 50);
-    }
-
-    return {
-		historyHash: historyHash, 
-        backStack: function() { return backStack; }, 
-        forwardStack: function() { return forwardStack }, 
-        getPlayer: getPlayer, 
-        initialize: function(src) {
-            _initialize(src);
-        }, 
-        setURL: function(url) {
-            document.location.href = url;
-        }, 
-        getURL: function() {
-            return document.location.href;
-        }, 
-        getTitle: function() {
-            return document.title;
-        }, 
-        setTitle: function(title) {
-            try {
-                backStack[backStack.length - 1].title = title;
-            } catch(e) { }
-            
-            document.title = title;
-        }, 
-        setDefaultURL: function(def)
-        {
-            defaultHash = def;
-            def = getHash();
-            //trailing ? is important else an extra frame gets added to the history
-            //when navigating back to the first page.  Alternatively could check
-            //in history frame navigation to compare # and ?.
-			if (browser.ie)
-			{
-                _ie_firstload = true;
-                getHistoryFrame().src = historyFrameSourcePrefix + def;
-                window.location.replace("#" + def);
-                setInterval(checkForUrlChange, 50);
-			}
-
-			if (browser.safari)
-			{
-                currentHistoryLength = history.length;
-                if (historyHash.length == 0) {
-                    historyHash[currentHistoryLength] = defaultHash;
-                    var newloc = "#" + def;
-                    window.location.replace(newloc);
-                } else {
-                    //alert(historyHash[historyHash.length-1]);
-                }
-                //setHash(def);
-                setInterval(checkForUrlChange, 50);
-			}
-			
-			
-			if (browser.firefox || browser.opera)
-			{
-                var reg = new RegExp("#" + def + "$");
-                if (window.location.toString().match(reg)) {
-                } else {
-                    var newloc ="#" + def;
-                    window.location.replace(newloc);
-                }
-                setInterval(checkForUrlChange, 50);
-                //setHash(def);
-            }
-        }, 
-
-        /* Set the current browser URL; called from inside BrowserManager to propagate
-         * the application state out to the container.
-         */
-        setBrowserURL: function(flexAppUrl, copyToAddressBar) {
-           //fromIframe = fromIframe || false;
-           //fromFlex = fromFlex || false;
-           //alert("setBrowserURL: " + flexAppUrl);
-           //flexAppUrl = (flexAppUrl == "") ? defaultHash : flexAppUrl ;
-
-           var pos = document.location.href.indexOf('#');
-           var baseUrl = pos != -1 ? document.location.href.substr(0, pos) : document.location.href;
-           var newUrl = baseUrl + '#' + flexAppUrl;
-
-           if (document.location.href != newUrl && document.location.href + '#' != newUrl) {
-               currentHref = newUrl;
-               addHistoryEntry(baseUrl, newUrl, flexAppUrl, copyToAddressBar);
-               currentHistoryLength = history.length;
-           }
-
-           return false;
-        } 
-
-    }
-
-})();
-
-// Initialization
-
-// Automated unit testing and other diagnostics
-
-function setURL(url)
-{
-    document.location.href = url;
-}
-
-function backButton()
-{
-    history.back();
-}
-
-function forwardButton()
-{
-    history.forward();
-}
-
-function goForwardOrBackInHistory(step)
-{
-    history.go(step);
-}
-
-DeepLinkingUtils.addEvent(window, "load", function() { DeepLinking.initialize(); });
diff --git a/grade/report/visual/flare_visualization/flare/flare.tests/html-template/deeplinking/historyFrame.html b/grade/report/visual/flare_visualization/flare/flare.tests/html-template/deeplinking/historyFrame.html
deleted file mode 100644
index 55788e05d8..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.tests/html-template/deeplinking/historyFrame.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<html>
-    <head>
-        <META HTTP-EQUIV="Pragma" CONTENT="no-cache"> 
-        <META HTTP-EQUIV="Expires" CONTENT="-1"> 
-    </head>
-    <body>
-    <script>
-        function processUrl()
-        {
-
-            var pos = url.indexOf("?");
-            url = pos != -1 ? url.substr(pos + 1) : "";
-            if (!parent._ie_firstload) {
-                parent.DeepLinking.setBrowserURL(url, true);
-                try {
-                    parent.DeepLinking.getPlayer().browserURLChange(url);
-                } catch(e) { }
-            } else {
-                parent._ie_firstload = false;
-            }
-        }
-
-        var url = document.location.href;
-        processUrl();
-        document.write(url);
-    </script>
-    Yo, I'm your history.
-    </body>
-</html>
diff --git a/grade/report/visual/flare_visualization/flare/flare.tests/html-template/index.template.html b/grade/report/visual/flare_visualization/flare/flare.tests/html-template/index.template.html
deleted file mode 100644
index 00a15d6229..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.tests/html-template/index.template.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<!-- saved from url=(0014)about:internet -->
-<html lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-
-<!--  BEGIN DeepLinking required section -->
-<link rel="stylesheet" type="text/css" href="deeplinking/deeplinking.css" />
-<!--  END DeepLinking required section -->
-
-<title>${title}</title>
-<script src="AC_OETags.js" language="javascript"></script>
-
-<!--  BEGIN DeepLinking required section -->
-<script src="deeplinking/deeplinking.js" language="javascript"></script>
-<!--  END DeepLinking required section -->
-
-<style>
-body { margin: 0px; overflow:hidden }
-</style>
-<script language="JavaScript" type="text/javascript">
-<!--
-// -----------------------------------------------------------------------------
-// Globals
-// Major version of Flash required
-var requiredMajorVersion = ${version_major};
-// Minor version of Flash required
-var requiredMinorVersion = ${version_minor};
-// Minor version of Flash required
-var requiredRevision = ${version_revision};
-// -----------------------------------------------------------------------------
-// -->
-</script>
-</head>
-
-<body scroll="no">
-<script language="JavaScript" type="text/javascript">
-<!--
-// Version check for the Flash Player that has the ability to start Player Product Install (6.0r65)
-var hasProductInstall = DetectFlashVer(6, 0, 65);
-
-// Version check based upon the values defined in globals
-var hasRequestedVersion = DetectFlashVer(requiredMajorVersion, requiredMinorVersion, requiredRevision);
-
-
-// Check to see if a player with Flash Product Install is available and the version does not meet the requirements for playback
-if ( hasProductInstall && !hasRequestedVersion ) {
-	// MMdoctitle is the stored document.title value used by the installation process to close the window that started the process
-	// This is necessary in order to close browser windows that are still utilizing the older version of the player after installation has completed
-	// DO NOT MODIFY THE FOLLOWING FOUR LINES
-	// Location visited after installation is complete if installation is required
-	var MMPlayerType = (isIE == true) ? "ActiveX" : "PlugIn";
-	var MMredirectURL = window.location;
-    document.title = document.title.slice(0, 47) + " - Flash Player Installation";
-    var MMdoctitle = document.title;
-
-	AC_FL_RunContent(
-		"src", "playerProductInstall",
-		"FlashVars", "MMredirectURL="+MMredirectURL+'&MMplayerType='+MMPlayerType+'&MMdoctitle='+MMdoctitle+"",
-		"width", "${width}",
-		"height", "${height}",
-		"align", "middle",
-		"id", "${application}",
-		"quality", "high",
-		"bgcolor", "${bgcolor}",
-		"name", "${application}",
-		"allowScriptAccess","sameDomain",
-		"type", "application/x-shockwave-flash",
-		"pluginspage", "http://www.adobe.com/go/getflashplayer"
-	);
-} else if (hasRequestedVersion) {
-	// if we've detected an acceptable version
-	// embed the Flash Content SWF when all tests are passed
-	AC_FL_RunContent(
-			"src", "${swf}",
-			"width", "${width}",
-			"height", "${height}",
-			"align", "middle",
-			"id", "${application}",
-			"quality", "high",
-			"bgcolor", "${bgcolor}",
-			"name", "${application}",
-			"allowScriptAccess","sameDomain",
-			"type", "application/x-shockwave-flash",
-			"pluginspage", "http://www.adobe.com/go/getflashplayer"
-	);
-  } else {  // flash is too old or we can't detect the plugin
-    var alternateContent = 'Alternate HTML content should be placed here. '
-  	+ 'This content requires the Adobe Flash Player. '
-   	+ '<a href=http://www.adobe.com/go/getflash/>Get Flash</a>';
-    document.write(alternateContent);  // insert non-flash content
-  }
-// -->
-</script>
-<noscript>
-  	<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
-			id="${application}" width="${width}" height="${height}"
-			codebase="http://fpdownload.macromedia.com/get/flashplayer/current/swflash.cab">
-			<param name="movie" value="${swf}.swf" />
-			<param name="quality" value="high" />
-			<param name="bgcolor" value="${bgcolor}" />
-			<param name="allowScriptAccess" value="sameDomain" />
-			<embed src="${swf}.swf" quality="high" bgcolor="${bgcolor}"
-				width="${width}" height="${height}" name="${application}" align="middle"
-				play="true"
-				loop="false"
-				quality="high"
-				allowScriptAccess="sameDomain"
-				type="application/x-shockwave-flash"
-				pluginspage="http://www.adobe.com/go/getflashplayer">
-			</embed>
-	</object>
-</noscript>
-</body>
-</html>
diff --git a/grade/report/visual/flare_visualization/flare/flare.tests/html-template/playerProductInstall.swf b/grade/report/visual/flare_visualization/flare/flare.tests/html-template/playerProductInstall.swf
deleted file mode 100644
index bdc3437856..0000000000
Binary files a/grade/report/visual/flare_visualization/flare/flare.tests/html-template/playerProductInstall.swf and /dev/null differ
diff --git a/grade/report/visual/flare_visualization/flare/flare.tests/lib/unitest.swc b/grade/report/visual/flare_visualization/flare/flare.tests/lib/unitest.swc
deleted file mode 100644
index bb7625b857..0000000000
Binary files a/grade/report/visual/flare_visualization/flare/flare.tests/lib/unitest.swc and /dev/null differ
diff --git a/grade/report/visual/flare_visualization/flare/flare.tests/tests.as b/grade/report/visual/flare_visualization/flare/flare.tests/tests.as
deleted file mode 100644
index eba30f067a..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.tests/tests.as
+++ /dev/null
@@ -1,28 +0,0 @@
-package {
-	import flare.tests.AnimationTests;
-	import flare.tests.DataIOTests;
-	import flare.tests.DataTests;
-	import flare.tests.ExpressionTests;
-	import flare.tests.SortTests;
-	import flare.tests.StringFormatTests;
-	import flare.tests.TreeTests;
-	
-	import unitest.TestSuite;
-	
-	[SWF(width="800", height="600", backgroundColor="#ffffff", frameRate="30")]
-	public class tests extends TestSuite
-	{	
-		public function tests()
-		{
-			addTest(new AnimationTests());
-			addTest(new StringFormatTests());
-			addTest(new ExpressionTests());
-			addTest(new DataTests());
-			addTest(new TreeTests());
-			addTest(new SortTests());
-			addTest(new DataIOTests());
-			run();
-		}
-		
-	} // end of class tests
-}
diff --git a/grade/report/visual/flare_visualization/flare/flare.util/.actionScriptProperties b/grade/report/visual/flare_visualization/flare/flare.util/.actionScriptProperties
deleted file mode 100644
index 03796fc2db..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.util/.actionScriptProperties
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<actionScriptProperties mainApplicationPath="flareutil.as" version="3">
-  <compiler additionalCompilerArguments="" copyDependentFiles="false" enableModuleDebug="true" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="false" htmlHistoryManagement="false" htmlPlayerVersion="9.0.28" htmlPlayerVersionCheck="true" outputFolderPath="bin" strict="true" useApolloConfig="false" verifyDigests="true" warn="true">
-    <compilerSourcePath/>
-    <libraryPath defaultLinkType="1">
-      <libraryPathEntry kind="4" path=""/>
-    </libraryPath>
-    <sourceAttachmentPath/>
-  </compiler>
-  <applications>
-    <application path="flareutil.as"/>
-  </applications>
-  <modules/>
-  <buildCSSFiles/>
-</actionScriptProperties>
diff --git a/grade/report/visual/flare_visualization/flare/flare.util/.flexLibProperties b/grade/report/visual/flare_visualization/flare/flare.util/.flexLibProperties
deleted file mode 100644
index 78937c67d6..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.util/.flexLibProperties
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<flexLibProperties version="1">
-  <includeClasses>
-    <classEntry path="flare.util.Arrays"/>
-    <classEntry path="flare.util.Colors"/>
-    <classEntry path="flare.util.Dates"/>
-    <classEntry path="flare.util.Maths"/>
-    <classEntry path="flare.util.Property"/>
-    <classEntry path="flare.util.Sort"/>
-    <classEntry path="flare.util.Stats"/>
-    <classEntry path="flare.util.Strings"/>
-    <classEntry path="flare.display.DirtySprite"/>
-    <classEntry path="flare.display.IRenderable"/>
-    <classEntry path="flare.display.LineSprite"/>
-    <classEntry path="flare.display.RectSprite"/>
-    <classEntry path="flare.display.TextSprite"/>
-  </includeClasses>
-  <includeResources/>
-  <namespaceManifests/>
-</flexLibProperties>
diff --git a/grade/report/visual/flare_visualization/flare/flare.util/.project b/grade/report/visual/flare_visualization/flare/flare.util/.project
deleted file mode 100644
index 9a905b9064..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.util/.project
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>flare.util</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.adobe.flexbuilder.project.flexbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.adobe.flexbuilder.project.flexlibnature</nature>
-		<nature>com.adobe.flexbuilder.project.actionscriptnature</nature>
-	</natures>
-</projectDescription>
diff --git a/grade/report/visual/flare_visualization/flare/flare.util/bin/flare.util.swc b/grade/report/visual/flare_visualization/flare/flare.util/bin/flare.util.swc
deleted file mode 100644
index 56dcbdbfa6..0000000000
Binary files a/grade/report/visual/flare_visualization/flare/flare.util/bin/flare.util.swc and /dev/null differ
diff --git a/grade/report/visual/flare_visualization/flare/flare.util/flare/display/DirtySprite.as b/grade/report/visual/flare_visualization/flare/flare.util/flare/display/DirtySprite.as
deleted file mode 100644
index 781162b28b..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.util/flare/display/DirtySprite.as
+++ /dev/null
@@ -1,198 +0,0 @@
-package flare.display
-{
-	import flash.display.DisplayObject;
-	import flash.display.Sprite;
-	import flash.display.Stage;
-	import flash.events.Event;
-	import flash.geom.Rectangle;
-	
-	/**
-	 * A Sprite that redraws itself as needed when marked as "dirty".
-	 * This allows multiple changes to be made to the sprite between frames
-	 * without triggering a potentially costly redraw for each property update.
-	 * Instead, the <code>dirty()</code> method should be called whenever a
-	 * change is made to the Sprite that would normally require a redraw. This
-	 * class will ensure that the Sprite is redrawn only once before the next
-	 * frame is rendered.
-	 * 
-	 * <p>Subclasses should place drawing code within the <code>render()</code>
-	 * method. For all properties used by the <code>render</code> method to help
-	 * draw this sprite, the corresponding "setter" method should call the
-	 * <code>dirty()</code> method to mark the sprite as dirty and thereby
-	 * trigger a redraw for the next frame.</p>
-	 * 
-	 * <p>Internally, the DirtySprite class maintains a static list of all
-	 * "dirty" sprites, and redraws each sprite in the list when a
-	 * <code>Event.RENDER</code> event is issued. Typically, this process is
-	 * performed automatically. In a few cases, erratic behavior has been
-	 * observed due to a Flash Player bug that results in <code>RENDER</code>
-	 * events not being properly issued. As a fallback, the static
-	 * <code>renderDirty()</code> method can be invoked to manually force
-	 * each dirty sprite to be redrawn.</p>
-	 */
-	public class DirtySprite extends Sprite implements IRenderable
-	{
-		private static var __stage:Stage;
-		private static var __installed:Boolean = false;
-		private static var __dirtyList:Array = [];
-		
-		/**
-		 * Installs the frame render listener on the stage.
-		 */	
-		private static function install(stage:Stage):void
-		{
-			__stage = stage;
-			__stage.addEventListener(Event.RENDER, renderDirty);
-			__installed = true;
-		}
-		
-		/**
-		 * Frame render callback that renders all sprites on the dirty list.
-		 * Typically, this method is automatically triggered by stage
-		 * RENDER events. It can also be manually invoked to redraw all
-		 * dirty DirtySprites.
-		 * @param evt the event that triggered the rendering (can be null)
-		 */
-		public static function renderDirty(evt:Event=null):void
-		{
-			while (__dirtyList.length > 0) {
-				var ds:DirtySprite = DirtySprite(__dirtyList.pop());
-				var db:Boolean = (ds._dirty == DIRTY);
-				ds._dirty = CLEAN;
-				if (db) ds.render();
-			}
-
-			// We need to remove and then re-add the listeners
-			// to work around Flash Player bugs (#139381?). Ugh.
-			// TODO: it seems this is not a complete solution, as in
-			// rare cases RENDER events are still omitted.
-			if (__stage != null) {
-				__stage.removeEventListener(Event.RENDER, renderDirty);
-				__installed = false;
-			}
-		}
-		
-		// --------------------------------------------------------------------
-		
-		private static const CLEAN:int = 0; // no changes
-		private static const DIRTY:int = 1; // re-rendering needed
-		private static const VISIT:int = 2; // was re-rendered, but on list
-		
-		/** @private */
-		protected var _dirty:int = DIRTY; // dirty at birth
-		
-		/**
-		 * Creates a new DirtySprite. Registers this Sprite to receive
-		 * added-to-stage events.
-		 */
-		public function DirtySprite() {
-			this.addEventListener(Event.ADDED_TO_STAGE, onAddToStage,
-								  false, 0, true); // use weak reference
-		}
-		
-		/**
-		 * Makes sure that "dirtying" changes made to this Sprite
-		 * while it is off the display list still result in a
-		 * re-rendering if the Sprite is ever added to the list.
-		 */
-		private function onAddToStage(evt:Event):void
-		{
-			if (_dirty) {
-				if (!__installed) install(stage);
-				__dirtyList.push(this);
-				stage.invalidate();
-			}
-		}
-
-		/**
-		 * Marks this sprite as "dirty" and in need of re-rendering.
-		 * The next time that (a) a new frame is rendered, and
-		 * (b) this Sprite is on the display list, the render method
-		 * will automatically be called.
-		 */
-		public final function dirty():void
-		{
-			if (_dirty == DIRTY) return;
-			
-			if (stage && !_dirty) {	
-				if (!__installed) install(stage);
-				__dirtyList.push(this);
-				stage.invalidate();
-			}
-			_dirty = DIRTY;
-		}
-		
-		/**
-		 * If dirty, this sprite is re-rendered before returning the width.
-		 */
-		public override function get width():Number
-		{
-			if (_dirty == DIRTY) { _dirty = VISIT; render(); }
-			return super.width;
-		}
-		
-		/**
-		 * If dirty, this sprite is re-rendered before returning the height.
-		 */
-		public override function get height():Number
-		{
-			if (_dirty == DIRTY) { _dirty = VISIT; render(); }
-			return super.height;
-		}
-		
-		/**
-		 * If dirty, this sprite is re-rendered before returning the rect.
-		 */
-		public override function getRect(targetCoordinateSpace:DisplayObject):Rectangle
-		{
-			if (_dirty == DIRTY) { _dirty = VISIT; render(); }
-			return super.getRect(targetCoordinateSpace);
-		}
-		
-		/**
-		 * If dirty, this sprite is re-rendered returning the bounds.
-		 */
-		public override function getBounds(targetCoordinateSpace:DisplayObject):Rectangle
-		{
-			if (_dirty == DIRTY) { _dirty = VISIT; render(); }
-			return super.getBounds(targetCoordinateSpace);
-		}
-		
-		/**
-		 * If dirty, either sprite is re-rendered before hit-testing.
-		 */
-		public override function hitTestObject(obj:DisplayObject):Boolean
-		{
-			if (_dirty == DIRTY) { _dirty = VISIT; render(); }
-			var ds:DirtySprite = obj as DirtySprite;
-			if (ds && ds._dirty == DIRTY) { ds._dirty = VISIT; ds.render(); }
-			return super.hitTestObject(obj);
-		}
-		
-		/**
-		 * If dirty, this sprite is re-rendered before hit-testing.
-		 */
-		public override function hitTestPoint(x:Number, y:Number, shapeFlag:Boolean=false):Boolean
-		{
-			if (_dirty == DIRTY) { _dirty = VISIT; render(); }
-			return super.hitTestPoint(x, y, shapeFlag);
-		}
-		
-		/**
-		 * Draw this sprite's graphical content. Subclasses should
-		 * override this method with custom drawing code.
-		 */
-		public function render():void
-		{
-			// for sub-classes to override...
-		}
-		
-		/** @inheritDoc */
-		public override function toString():String
-		{
-			var s:String = super.toString();
-			return name==null ? s : s + " \""+name+"\"";
-		}
-		
-	} // end of class DirtySprite
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.util/flare/display/IRenderable.as b/grade/report/visual/flare_visualization/flare/flare.util/flare/display/IRenderable.as
deleted file mode 100644
index b12c6f2fda..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.util/flare/display/IRenderable.as
+++ /dev/null
@@ -1,13 +0,0 @@
-package flare.display
-{	
-	/**
-	 * Interface for "renderable" objects that can redraw themselves.
-	 */
-	public interface IRenderable
-	{
-		/**
-		 * Redraw this renderable object.
-		 */
-		function render():void;
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.util/flare/display/LineSprite.as b/grade/report/visual/flare_visualization/flare/flare.util/flare/display/LineSprite.as
deleted file mode 100644
index e13cb8fe80..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.util/flare/display/LineSprite.as
+++ /dev/null
@@ -1,50 +0,0 @@
-package flare.display
-{
-	/**
-	 * A Sprite representing a line. Supports position, color, and width
-	 * properties.
-	 */
-	public class LineSprite extends DirtySprite
-	{
-		private var _color:uint = 0xcccccc;
-		private var _width:Number = 0;
-		private var _x1:Number;
-		private var _y1:Number;
-		private var _x2:Number;
-		private var _y2:Number;
-		
-		/** The x-coordinate for the first line endpoint. */
-		public function get x1():Number  { return _x1; }
-		public function set x1(x:Number):void { _x1 = x; dirty(); }
-		
-		/** The y-coordinate for the first line endpoint. */
-		public function get y1():Number  { return _y1; }
-		public function set y1(y:Number):void { _y1 = y; dirty(); }
-		
-		/** The x-coordinate for the second line endpoint. */
-		public function get x2():Number  { return _x2; }
-		public function set x2(x:Number):void { _x2 = x; dirty(); }
-
-		/** The y-coordinate for the second line endpoint. */		
-		public function get y2():Number  { return _y2; }
-		public function set y2(y:Number):void { _y2 = y; dirty(); }
-		
-		/** The color of the line. */
-		public function get lineColor():uint  { return _color; }
-		public function set lineColor(c:uint):void { _color = c; dirty(); }
-		
-		/** The width of the line. A value of zero indicates a hairwidth line,
-		 *  as determined by <code>Graphics.lineStyle</code> */
-		public function get lineWidth():Number  { return _width; }
-		public function set lineWidth(w:Number):void { _width = w; dirty(); }
-		
-		public override function render():void
-		{
-			graphics.clear();
-			graphics.lineStyle(_width, _color, 1, true, "none");
-			graphics.moveTo(_x1, _y1);
-			graphics.lineTo(_x2, _y2);
-		}
-		
-	} // end of class LineSprite
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.util/flare/display/RectSprite.as b/grade/report/visual/flare_visualization/flare/flare.util/flare/display/RectSprite.as
deleted file mode 100644
index 86868e953c..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.util/flare/display/RectSprite.as
+++ /dev/null
@@ -1,107 +0,0 @@
-package flare.display
-{
-	import flare.util.Colors;
-	
-	/**
-	 * A Sprite representing a rectangle shape. Supports line and fill colors
-	 * and rounded corners.
-	 */
-	public class RectSprite extends DirtySprite
-	{
-		/** @private */
-		protected var _w:Number;
-		/** @private */
-		protected var _h:Number;
-		/** @private */
-		protected var _cw:Number = 0;
-		/** @private */
-		protected var _ch:Number = 0;
-		/** @private */
-		protected var _fillColor:uint = 0x00ffffff;
-		/** @private */
-		protected var _lineColor:uint = 0xffaaaaaa;
-		/** @private */
-		protected var _lineWidth:Number = 0;
-		/** @private */
-		protected var _pixelHinting:Boolean = true;
-		
-		/** The width of the rectangle. */
-		public function get w():Number { return _w; }
-		public function set w(v:Number):void { _w = v; dirty(); }
-		
-		/** The height of the rectangle. */
-		public function get h():Number { return _h; }
-		public function set h(v:Number):void { _h = v; dirty(); }
-		
-		/** The width of rounded corners. Zero indicates no rounding. */
-		public function get cornerWidth():Number { return _cw; }
-		public function set cornerWidth(v:Number):void { _cw = v; dirty(); }
-		
-		/** The height of rounded corners. Zero indicates no rounding. */
-		public function get cornerHeight():Number { return _ch; }
-		public function set cornerHeight(v:Number):void { _ch = v; dirty(); }
-		
-		/** Sets corner width and height simultaneously. */
-		public function set cornerSize(v:Number):void { _cw = _ch = v; dirty(); }
-		
-		/** The fill color of the rectangle. */
-		public function get fillColor():uint { return _fillColor; }
-		public function set fillColor(c:uint):void { _fillColor = c; dirty(); }
-		
-		/** The line color of the rectangle outline. */
-		public function get lineColor():uint { return _lineColor; }
-		public function set lineColor(c:uint):void { _lineColor = c; dirty(); }
-		
-		/** The line width of the rectangle outline. */
-		public function get lineWidth():Number { return _lineWidth; }
-		public function set lineWidth(v:Number):void { _lineWidth = v; dirty(); }
-		
-		/** Flag indicating if pixel hinting should be used for the outline. */
-		public function get linePixelHinting():Boolean { return _pixelHinting; }
-		public function set linePixelHinting(b:Boolean):void {
-			_pixelHinting = b; dirty();
-		}
-				
-		/**
-		 * Creates a new RectSprite.
-		 * @param x the x-coordinate of the top-left corner of the rectangle
-		 * @param y the y-coordinate of the top-left corder of the rectangle
-		 * @param w the width of the rectangle
-		 * @param h the height of the rectangle
-		 * @param cw the width of rounded corners (zero for no rounding)
-		 * @param ch the height of rounded corners (zero for no rounding)
-		 */
-		public function RectSprite(x:Number=0, y:Number=0, w:Number=0,
-			h:Number=0, cw:Number=0, ch:Number=0)
-		{
-			this.x = x;
-			this.y = y;
-			this._w = w;
-			this._h = h;
-			this._cw = cw;
-			this._ch = ch;
-		}
-		
-		/** @inheritDoc */
-		public override function render():void
-		{
-			graphics.clear();
-			if (isNaN(_w) || isNaN(_h)) return;
-			
-			var la:Number = Colors.a(_lineColor) / 255;
-			var fa:Number = Colors.a(_fillColor) / 255;
-			var lc:uint = _lineColor & 0x00ffffff;
-			var fc:uint = _fillColor & 0x00ffffff;
-
-			if (la>0) graphics.lineStyle(_lineWidth, lc, la, _pixelHinting);
-			graphics.beginFill(fc, fa);
-			if (_cw > 0 || _ch > 0) {
-				graphics.drawRoundRect(0, 0, _w, _h, _cw, _ch);
-			} else {
-				graphics.drawRect(0, 0, _w, _h);
-			}
-			graphics.endFill();
-		}
-		
-	} // end of class RectSprite
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.util/flare/display/TextSprite.as b/grade/report/visual/flare_visualization/flare/flare.util/flare/display/TextSprite.as
deleted file mode 100644
index 1ba8cd460b..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.util/flare/display/TextSprite.as
+++ /dev/null
@@ -1,337 +0,0 @@
-package flare.display
-{
-	import flash.display.Bitmap;
-	import flash.display.BitmapData;
-	import flash.display.DisplayObject;
-	import flash.display.Shape;
-	import flash.geom.Rectangle;
-	import flash.text.TextField;
-	import flash.text.TextFieldAutoSize;
-	import flash.text.TextFormat;
-
-	/**
-	 * A Sprite representing a text label.
-	 * TextSprites support multiple forms of text representation: bitmapped
-	 * text, embedded font text, and standard (device font) text. This allows
-	 * flexibility in how text labels are handled. For example, by default,
-	 * text fields using device fonts do not support alpha blending or
-	 * rotation. By using a TextSprite in BITMAP mode, the text is rendered
-	 * out to a bitmap which can then be alpha blended.
-	 */
-	public class TextSprite extends DirtySprite
-	{
-		// vertical anchors
-		/**
-		 * Constant for vertically aligning the top of the text field
-		 * to a TextSprite's y-coordinate.
-		 */
-		public static const TOP:int = 0;
-		/**
-		 * Constant for vertically aligning the middle of the text field
-		 * to a TextSprite's y-coordinate.
-		 */
-		public static const MIDDLE:int = 1;
-		/**
-		 * Constant for vertically aligning the bottom of the text field
-		 * to a TextSprite's y-coordinate.
-		 */
-		public static const BOTTOM:int = 2;
-
-		// horizontal anchors
-		/**
-		 * Constant for horizontally aligning the left of the text field
-		 * to a TextSprite's y-coordinate.
-		 */
-		public static const LEFT:int = 0;
-		/**
-		 * Constant for horizontally aligning the center of the text field
-		 * to a TextSprite's y-coordinate.
-		 */
-		public static const CENTER:int = 1;
-		/**
-		 * Constant for horizontally aligning the right of the text field
-		 * to a TextSprite's y-coordinate.
-		 */
-		public static const RIGHT:int = 2;
-		
-		// text handling modes
-		/**
-		 * Constant indicating that text should be rendered using a TextField
-		 * instance using device fonts.
-		 */
-		public static const DEVICE:uint = 0;
-		/**
-		 * Constant indicating that text should be rendered using a TextField
-		 * instance using embedded fonts. For this mode to work, the fonts
-		 * used must be embedded in your application SWF file.
-		 */
-		public static const EMBED:uint = 1;
-		/**
-		 * Constant indicating that text should be rendered into a Bitmap
-		 * instance.
-		 */
-		public static const BITMAP:uint = 2;
-		
-		private var _mode:int = -1;
-		private var _bmap:Bitmap;
-		private var _tf:TextField;
-		private var _fmt:TextFormat;
-		private var _locked:Boolean = false;
-		private var _maskColor:uint = 0xFFFFFF;
-		
-		private var _hAnchor:int = LEFT;
-		private var _vAnchor:int = TOP;
-		
-		/**
-		 * The TextField instance backing this TextSprite.
-		 */
-		public function get textField():TextField { return _tf; }
-		
-		/**
-		 * The text rendering mode for this TextSprite, one of BITMAP,
-		 * DEVICE, or EMBED.
-		 */
-		public function get textMode():int { return _mode; }
-		public function set textMode(mode:int):void {
-			setMode(mode); //dirty();
-		}
-		
-		/**
-		 * The text string drawn by this TextSprite.
-		 */
-		public function get text():String { return _tf.text; }
-		public function set text(txt:String):void {
-			if (_tf.text != txt) {
-				_tf.text = txt;
-				if (_fmt!=null) _tf.setTextFormat(_fmt);
-				dirty();
-			}
-		}
-		
-		/**
-		 * The font to the text.
-		 */
-		public function get font():String { return String(_fmt.font); }
-		public function set font(f:String):void {
-			_fmt.font = f;
-			_tf.setTextFormat(_fmt);
-			if (_mode==BITMAP) dirty();
-		}
-		
-		/**
-		 * The color of the text.
-		 */
-		public function get color():uint { return uint(_fmt.color); }
-		public function set color(c:uint):void {
-			_fmt.color = c;
-			_tf.setTextFormat(_fmt);
-			if (_mode==BITMAP) dirty();
-		}
-		
-		/**
-		 * The size of the text.
-		 */
-		public function get size():Number { return Number(_fmt.size); }
-		public function set size(s:Number):void {
-			_fmt.size = s;
-			_tf.setTextFormat(_fmt);
-			if (_mode==BITMAP) dirty();
-		}
-		
-		/**
-		 * The boldness of the text.
-		 */
-		public function get bold():Boolean { return Boolean(_fmt.bold); }
-		public function set bold(b:Boolean):void {
-			_fmt.bold = b;
-			_tf.setTextFormat(_fmt);
-			if (_mode==BITMAP) dirty();
-		}
-		
-		/**
-		 * The italics of the text.
-		 */
-		public function get italic():Boolean { return Boolean(_fmt.italic); }
-		public function set italic(b:Boolean):void {
-			_fmt.italic = b;
-			_tf.setTextFormat(_fmt);
-			if (_mode==BITMAP) dirty();
-		}
-		
-		/**
-		 * The underline of the text.
-		 */
-		public function get underline():Boolean { return Boolean(_fmt.underline); }
-		public function set underline(b:Boolean):void {
-			_fmt.underline = b;
-			_tf.setTextFormat(_fmt);
-			if (_mode==BITMAP) dirty();
-		}
-		
-		/**
-		 * The kerning of the text.
-		 */
-		public function get kerning():Boolean { return Boolean(_fmt.kerning); }
-		public function set kerning(b:Boolean):void {
-			_fmt.kerning = b;
-			_tf.setTextFormat(_fmt);
-			if (_mode==BITMAP) dirty();
-		}
-		
-		/**
-		 * The letter-spacing of the text.
-		 */
-		public function get letterSpacing():int { return int(_fmt.letterSpacing); }
-		public function set letterSpacing(s:int):void {
-			_fmt.letterSpacing = s;
-			_tf.setTextFormat(_fmt);
-			if (_mode==BITMAP) dirty();
-		}
-		
-		/**
-		 * The horizontal anchor for the text, one of LEFT, RIGHT, or CENTER.
-		 * This setting determines how the text is horizontally aligned with
-		 * respect to this TextSprite's (x,y) location.
-		 */
-		public function get horizontalAnchor():int { return _hAnchor; }
-		public function set horizontalAnchor(a:int):void { 
-			if (_hAnchor != a) { _hAnchor = a; layout(); }
-		}
-		
-		/**
-		 * The vertical anchor for the text, one of TOP, BOTTOM, or MIDDLE.
-		 * This setting determines how the text is vertically aligned with
-		 * respect to this TextSprite's (x,y) location.
-		 */
-		public function get verticalAnchor():int { return _vAnchor; }
-		public function set verticalAnchor(a:int):void {
-			if (_vAnchor != a) { _vAnchor = a; layout(); }
-		}
-		
-		// --------------------------------------------------------------------
-		
-		/**
-		 * Creates a new TextSprite instance.
-		 * @param text the text string for this label
-		 * @param format the TextFormat determining font family, size, and style
-		 * @param mode the text rendering mode to use (BITMAP by default)
-		 */
-		public function TextSprite(text:String=null, format:TextFormat=null, mode:int=BITMAP) {
-			_tf = new TextField();
-			_tf.autoSize = TextFieldAutoSize.LEFT;
-			if (text != null) _tf.text = text;
-			_fmt = format;
-			if (format != null) _tf.setTextFormat(format);
-			_bmap = new Bitmap();
-			setMode(mode);
-			dirty();
-		}
-		
-		protected function setMode(mode:int):void
-		{
-			if (mode == _mode) return; // nothing to do
-			
-			switch (_mode) {
-				case BITMAP:
-					_bmap.bitmapData = null;
-					removeChild(_bmap);
-					break;
-				case EMBED:
-					_tf.embedFonts = false;
-				case DEVICE:
-					removeChild(_tf);
-					break;
-			}
-			switch (mode) {
-				case BITMAP:
-					rasterize();
-					addChild(_bmap);
-					break;
-				case EMBED:
-					_tf.embedFonts = true;
-				case DEVICE:
-					addChild(_tf);
-					break;
-			}
-			_mode = mode;
-		}
-		
-		/** @inheritDoc */
-		public override function render():void
-		{
-			if (_mode == BITMAP) {
-				rasterize();
-			}
-			layout();
-		}
-		
-		/** @private */
-		protected function layout():void
-		{
-			var d:DisplayObject = (_mode==BITMAP ? _bmap : _tf);
-			
-			// horizontal anchor
-			switch (_hAnchor) {
-				case CENTER: d.x = -d.width / 2; break;
-				case RIGHT:  d.x = -d.width; break;
-			}
-			// vertical anchor
-			switch (_vAnchor) {
-				case MIDDLE: d.y = -d.height / 2; break;
-				case BOTTOM: d.y = -d.height; break;
-			}
-		}
-		
-		/** @private */
-		protected function rasterize():void
-		{
-			if (_locked) return;
-			var tw:Number = _tf.width;
-			var th:Number = _tf.height;
-			var bd:BitmapData = _bmap.bitmapData;
-			if (bd == null || bd.width != tw || bd.height != th) {
-				bd = new BitmapData(tw, th, true, 0x00ffffff);
-				_bmap.bitmapData = bd;
-			} else {
-				bd.fillRect(new Rectangle(0,0,tw,th), 0x00ffffff);
-			}
-			bd.draw(_tf);
-		}
-		
-		/**
-		 * Sets the text format for the TextSprite.
-		 * @param format the text format
-		 * @param beginIndex the beginning index into the text string
-		 * @param endIndex the ending index into the text string
-		 */		
-		public function setTextFormat(format:TextFormat, beginIndex:int=-1, endIndex:int=-1):void
-		{
-			_fmt = format;
-			_tf.setTextFormat(format, beginIndex, endIndex);
-			dirty();
-		}
-		
-		/**
-		 * Locks this TextSprite, such that no re-rendering of the text is
-		 * performed until the <code>unlock</code> method is called. This
-		 * method can be used if a number of sequential updates are to be made.
-		 */
-		public function lock():void
-		{
-			_locked = true;
-		}
-		
-		/**
-		 * Unlocks this TextSprite, allowing re-rendering to resume if the
-		 * sprite has been locked using the <code>lock</code> method.
-		 */
-		public function unlock():void
-		{
-			if (_locked) {
-				_locked = false;
-				if (_mode == BITMAP) rasterize();
-			}
-		}
-		
-	} // end of class TextSprite
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.util/flare/util/Arrays.as b/grade/report/visual/flare_visualization/flare/flare.util/flare/util/Arrays.as
deleted file mode 100644
index cc30e20622..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.util/flare/util/Arrays.as
+++ /dev/null
@@ -1,161 +0,0 @@
-package flare.util
-{
-	/**
-	 * Utility methods for working with arrays.
-	 */
-	public class Arrays
-	{
-		public static const EMPTY:Array = new Array(0);
-		
-		/**
-		 * Constructor, throws an error if called, as this is an abstract class.
-		 */
-		public function Arrays() {
-			throw new ArgumentError("This is an abstract class.");
-		}
-		
-		/**
-		 * Returns the maximum value in an array. Comparison is determined
-		 * using the greater-than operator against arbitrary types.
-		 * @param a the array
-		 * @return the maximum value
-		 */
-		public static function max(a:Array):Number
-		{
-			var x:Number = Number.MIN_VALUE;
-			for (var i:uint=0; i<a.length; ++i) {
-				if (a[i] > x) x = a[i];
-			}
-			return x;
-		}
-		
-		/**
-		 * Returns the minimum value in an array. Comparison is determined
-		 * using the less-than operator against arbitrary types.
-		 * @param a the array
-		 * @return the minimum value
-		 */
-		public static function min(a:Array):Number
-		{
-			var x:Number = Number.MAX_VALUE;
-			for (var i:uint=0; i<a.length; ++i) {
-				if (a[i] < x) x = a[i];
-			}
-			return x;
-		}
-		
-		/**
-		 * Fills an array with a given value.
-		 * @param a the array
-		 * @param o the value with which to fill the array
-		 */
-		public static function fill(a:Array, o:*) : void
-		{
-			for (var i:uint = 0; i<a.length; ++i) {
-				a[i] = o;
-			}
-		}
-		
-		/**
-		 * Makes a copy of an array or copies the contents of one array to
-		 * another.
-		 * @param a the array to copy
-		 * @param b the array to copy values to. If null, a new array is
-		 *  created.
-		 * @param a0 the starting index from which to copy values
-		 *  of the input array
-		 * @param b0 the starting index at which to write value into the
-		 *  output array
-		 * @param len the number of values to copy
-		 * @return the target array containing the copied values
-		 */
-		public static function copy(a:Array, b:Array=null, a0:int=0, b0:int=0, len:int=-1) : Array {
-			len = (len < 0 ? a.length : len);
-			if (b==null || b.length < len)
-				b = new Array(len);
-
-			for (var i:uint = 0; i<len; ++i) {
-				b[b0+i] = a[a0+i];
-			}
-			return b;
-		}
-		
-		/**
-		 * Clears an array instance, removing all values.
-		 * @param a the array to clear
-		 */
-		public static function clear(a:Array):void
-		{
-			while (a.length > 0) a.pop();
-		}
-				
-		/**
-		 * Removes an element from an array. Only the first instance of the
-		 * value is removed.
-		 * @param a the array
-		 * @param o the value to remove
-		 * @return the index location at which the removed element was found,
-		 * negative if the value was not found.
-		 */
-		public static function remove(a:Array, o:Object) : int {
-			var idx:int = a.indexOf(o);
-			if (idx == a.length-1) {
-				a.pop();
-			} else if (idx >= 0) {
-				a.splice(idx, 1);
-			}
-			return idx;
-		}
-		
-		/**
-		 * Removes the array element at the given index.
-		 * @param a the array
-		 * @param idx the index at which to remove an element
-		 * @return the removed element
-		 */
-		public static function removeAt(a:Array, idx:uint) : Object {
-			if (idx == a.length-1) {
-				return a.pop();
-			} else {
-				var x:Object = a[idx];
-				a.splice(idx,1);
-				return x;
-			}
-		}
-		
-		/**
-		 * Performs a binary search over the input array for the given key
-		 * value, optionally using a provided property to extract from array
-		 * items and a custom comparison function.
-		 * @param a the array to search over
-		 * @param key the key value to search for
-		 * @param prop the property to retrieve from objecs in the array. If null
-		 *  (the default) the array values will be used directly.
-		 * @param cmp an optional comparison function
-		 * @return the index of the given key if it exists in the array,
-         *  otherwise -1 times the index value at the insertion point that
-         *  would be used if the key were added to the array.
-         */
-		public static function binarySearch(a:Array, key:Object,
-			prop:String=null, cmp:Function=null) : int
-		{
-			if (cmp==null) cmp = Sort.defaultComparator;
-			var p:Property = prop ? Property.$(prop) : null;
-			
-			var x1:int = 0, x2:int = a.length, i:int = (x2>>1);
-        	while (x1 < x2) {
-        		var c:int = cmp(p ? p.getValue(a[i]) : a[i], key);
-        		if (c == 0) {
-                	return i;
-            	} else if (c < 0) {
-                	x1 = i + 1;
-            	} else {
-                	x2 = i;
-            	}
-            	i = x1 + ((x2 - x1)>>1);
-        	}
-        	return -1*(i+1);
-		}
-
-	} // end of class Arrays
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.util/flare/util/Colors.as b/grade/report/visual/flare_visualization/flare/flare.util/flare/util/Colors.as
deleted file mode 100644
index b5ca9b42f4..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.util/flare/util/Colors.as
+++ /dev/null
@@ -1,234 +0,0 @@
-package flare.util
-{	
-	/**
-	 * Utility methods for working with colors.
-	 */
-	public class Colors
-	{
-		/**
-		 * Constructor, throws an error if called, as this is an abstract class.
-		 */
-		public function Colors() {
-			throw new Error("This is an abstract class.");
-		}
-				
-		/**
-		 * Returns the alpha component of a color value
-		 * @param c the color value
-		 * @return the alpha component
-		 */
-		public static function a(c:uint):uint
-		{
-			return (c >> 24) & 0xFF;
-		}
-		
-		/**
-		 * Returns the red component of a color value
-		 * @param c the color value
-		 * @return the red component
-		 */
-		public static function r(c:uint):uint
-		{
-			return (c >> 16) & 0xFF;
-		}
-		
-		/**
-		 * Returns the green component of a color value
-		 * @param c the color value
-		 * @return the green component
-		 */
-		public static function g(c:uint):uint
-		{
-			return (c >> 8) & 0xFF;
-		}
-		
-		/**
-		 * Returns the blue component of a color value
-		 * @param c the color value
-		 * @return the blue component
-		 */
-		public static function b(c:uint):uint
-		{
-			return (c & 0xFF);
-		}
-		
-		/**
-		 * Returns a color value with the given red, green, blue, and alpha
-		 * components
-		 * @param r the red component (0-255)
-		 * @param g the green component (0-255)
-		 * @param b the blue component (0-255)
-		 * @param a the alpha component (0-255, 255 by default)
-		 * @return the color value
-		 * 
-		 */
-		public static function rgba(r:uint, g:uint, b:uint, a:uint=255):uint
-		{
-			return ((a & 0xFF) << 24) | ((r & 0xFF) << 16) |
-				   ((g & 0xFF) <<  8) |  (b & 0xFF);
-		}
-		
-		/**
-		 * Returns a color value by updating the alpha component of another
-		 * color value.
-		 * @param c a color value
-		 * @param a the desired alpha component (0-255)
-		 * @return a color value with adjusted alpha component
-		 */
-		public static function setAlpha(c:uint, a:uint):uint
-		{
-			return ((a & 0xFF) << 24) | (c & 0x00FFFFFF);
-		}
-		
-		/**
-		 * Returns the RGB color value for a color specified in HSV (hue,
-		 * saturation, value) color space.
-		 * @param h the hue, a value between 0 and 1
-		 * @param s the saturation, a value between 0 and 1
-		 * @param v the value (brighntess), a value between 0 and 1
-		 * @param a the (optional) alpha value, an integer between 0 and 255
-		 *  (255 is the default)
-		 * @return the corresponding RGB color value
-		 */
-		public static function hsv(h:Number, s:Number, v:Number, a:uint=255):uint
-		{
-			var r:uint=0, g:uint=0, b:uint=0;
-            if (s == 0) {
-                r = g = b = uint(v * 255 + .5);
-            } else {
-            	var i:Number = (h - Math.floor(h)) * 6.0;
-                var f:Number = i - Math.floor(i);
-                var p:Number = v * (1 - s);
-                var q:Number = v * (1 - s * f);
-                var t:Number = v * (1 - (s * (1 - f)));
-                switch (int(i))
-                {
-                    case 0:
-                        r = uint(v * 255 + .5);
-                        g = uint(t * 255 + .5);
-                        b = uint(p * 255 + .5);
-                        break;
-                    case 1:
-                        r = uint(q * 255 + .5);
-                        g = uint(v * 255 + .5);
-                        b = uint(p * 255 + .5);
-                        break;
-                    case 2:
-                        r = uint(p * 255 + .5);
-                        g = uint(v * 255 + .5);
-                        b = uint(t * 255 + .5);
-                        break;
-                    case 3:
-                        r = uint(p * 255 + .5);
-                        g = uint(q * 255 + .5);
-                        b = uint(v * 255 + .5);
-                        break;
-                    case 4:
-                        r = uint(t * 255 + .5);
-                        g = uint(p * 255 + .5);
-                        b = uint(v * 255 + .5);
-                        break;
-                    case 5:
-                        r = uint(v * 255 + .5);
-                        g = uint(p * 255 + .5);
-                        b = uint(q * 255 + .5);
-                        break;
-                }
-            }
-            return rgba(r, g, b, a);
-		}
-		
-		 /**
-	     * Interpolate between two color values by the given mixing proportion.
-	     * A mixing fraction of 0 will result in c1, a value of 1.0 will result
-	     * in c2, and value of 0.5 will result in the color mid-way between the
-	     * two in RGB color space.
-	     * @param c1 the starting color
-	     * @param c2 the target color
-	     * @param f a fraction between 0 and 1 controlling the interpolation
-	     * @return the interpolated color
-	     */
-		public static function interpolate(c1:uint, c2:uint, f:Number):uint
-		{
-			var t:uint;
-			return rgba(
-				(t=r(c1)) + f*(r(c2)-t),
-				(t=g(c1)) + f*(g(c2)-t),
-				(t=b(c1)) + f*(b(c2)-t),
-				(t=a(c1)) + f*(a(c2)-t)
-			);
-		}
-    
-	    /**
-	     * Get a darker shade of an input color.
-	     * @param c a color value
-	     * @return a darkened color value
-	     */
-	    public static function darker(c:uint, s:Number=1):uint
-	    {
-	    	s = Math.pow(0.7, s);
-	        return rgba(Math.max(0, int(s*r(c))),
-	                    Math.max(0, int(s*g(c))),
-	                    Math.max(0, int(s*b(c))),
-	                    a(c));
-	    }
-	
-	    /**
-	     * Get a brighter shade of an input color.
-	     * @param c a color value
-	     * @return a brighter color value
-	     */
-	    public static function brighter(c:uint, s:Number=1):uint
-	    {
-	    	var cr:uint, cg:uint, cb:uint, i:uint;
-	    	s = Math.pow(0.7, s);
-	    	
-	        cr = r(c), cg = g(c), cb = b(c);
-	        i = 30;
-	        if (cr == 0 && cg == 0 && cb == 0) {
-	           return rgba(i, i, i, a(c));
-	        }
-	        if ( cr > 0 && cr < i ) cr = i;
-	        if ( cg > 0 && cg < i ) cg = i;
-	        if ( cb > 0 && cb < i ) cb = i;
-	
-	        return rgba(Math.min(255, (int)(cr/s)),
-	                    Math.min(255, (int)(cg/s)),
-	                    Math.min(255, (int)(cb/s)),
-	                    a(c));
-	    }
-	    
-	    /**
-	     * Get a desaturated shade of an input color.
-	     * @param c a color value
-	     * @return a desaturated color value
-	     */
-	    public static function desaturate(c:uint):uint
-	    {
-	        var a:uint = c & 0xff000000;
-	        var cr:Number = Number(r(c));
-	        var cg:Number = Number(g(c));
-	        var cb:Number = Number(b(c));
-	
-	        cr *= 0.2125; // red band weight
-	        cg *= 0.7154; // green band weight
-	        cb *= 0.0721; // blue band weight
-	
-	        var gray:uint = uint(Math.min(int(cr+cg+cb),0xff)) & 0xff;
-	        return a | (gray << 16) | (gray << 8) | gray;
-	    }
-	    
-	    /**
-	     * A color transform matrix that desaturates colors to corresponding
-	     * grayscale values. Can be used with the
-	     * <code>flash.filters.ColorMatrixFilter</code> class.
-	     */
-	    public static function get desaturationMatrix():Array {
-	    	return [0.2125, 0.7154, 0.0721, 0, 0,
-	    			0.2125, 0.7154, 0.0721, 0, 0,
-	    			0.2125, 0.7154, 0.0721, 0, 0,
-	    			     0,      0,      0, 1, 0];
-	    }
-	    
-	} // end of class Colors
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.util/flare/util/Dates.as b/grade/report/visual/flare_visualization/flare/flare.util/flare/util/Dates.as
deleted file mode 100644
index bc8e17819d..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.util/flare/util/Dates.as
+++ /dev/null
@@ -1,226 +0,0 @@
-package flare.util
-{	
-	/**
-	 * Utility methods for working with Date instances.
-	 */
-	public class Dates
-	{
-		// enumerated constants
-		/** Constant indicating a time span of one or more years. */
-		public static const YEARS:int        = 0;
-		/** Constant indicating a time span on the order of months. */
-		public static const MONTHS:int       = -1;
-		/** Constant indicating a time span on the order of days. */
-		public static const DAYS:int         = -2;
-		/** Constant indicating a time span on the order of hours. */
-		public static const HOURS:int        = -3;
-		/** Constant indicating a time span on the order of minutes. */
-		public static const MINUTES:int      = -4;
-		/** Constant indicating a time span on the order of seconds. */
-		public static const SECONDS:int      = -5;
-		/** Constant indicating a time span on the order of milliseconds. */
-		public static const MILLISECONDS:int = -6;
-		/** Constant indicating a time span on the order of weeks. */
-		public static const WEEKS:int = -10;
-		
-		/** Number of milliseconds in a minute. */
-		public static const MS_MIN:Number  = 60*1000;
-		/** Number of milliseconds in an hours. */
-		public static const MS_HOUR:Number = 60*60*1000;
-		/** Number of milliseconds in a day. */
-		public static const MS_DAY:Number  = 24*60*60*1000;
-		
-		/**
-		 * Constructor, throws an error if called, as this is an abstract class.
-		 */
-		public function Dates() {
-			throw new Error("This is an abstract class.");
-		}
-		
-		// -- Conversion ------------------------------------------------------
-		
-		/**
-		 * Given a date, returns a date instance of the same time in Univeral
-		 * Coordinated Time (UTC).
-		 * @param d the date to convert
-		 */
-		public static function toUTC(d:Date) : Date {
-			return new Date(d.fullYearUTC, d.monthUTC, d.dateUTC, d.hoursUTC,
-							d.minutesUTC, d.secondsUTC, d.millisecondsUTC);
-		}
-		
-		// -- Date Arithmetic -------------------------------------------------
-		
-		/**
-		 * Adds years to a date instance.
-		 * @param d the date
-		 * @param x the number of years to add (can be negative to subtract)
-		 * @return a new Date representing the new date and time
-		 */
-		public static function addYears(d:Date, x:int) : Date {
-			return new Date(d.fullYear+x, d.month, d.date, d.hours, d.minutes, d.seconds, d.milliseconds);
-		}
-		
-		/**
-		 * Adds months to a date instance.
-		 * @param d the date
-		 * @param x the number of months to add (can be negative to subtract)
-		 * @return a new Date representing the new date and time
-		 */
-		public static function addMonths(d:Date, x:int) : Date {
-			var y:Number = Math.floor(x / 12); x -= 12*y;
-			var m:Number = d.month + x;
-			if (m > 11) {
-				y += 1;
-				m -= 12;
-			} else if (m < 0) {
-				y -= 1;
-				m += 12;
-			}
-			return new Date(d.fullYear+y, m, d.date, d.hours, d.minutes, d.seconds, d.milliseconds);
-		}
-		
-		/**
-		 * Adds days to a date instance.
-		 * @param d the date
-		 * @param x the number of days to add (can be negative to subtract)
-		 * @return a new Date representing the new date and time
-		 */
-		public static function addDays(d:Date, x:int) : Date {
-			return new Date(d.time + MS_DAY * x);
-		}
-		
-		/**
-		 * Adds hours to a date instance.
-		 * @param d the date
-		 * @param x the number of hours to add (can be negative to subtract)
-		 * @return a new Date representing the new date and time
-		 */
-		public static function addHours(d:Date, x:int) : Date {
-			return new Date(d.time + MS_HOUR * x);
-		}
-		
-		/**
-		 * Adds minutes to a date instance.
-		 * @param d the date
-		 * @param x the number of minutes to add (can be negative to subtract)
-		 * @return a new Date representing the new date and time
-		 */
-		public static function addMinutes(d:Date, x:int) : Date {
-			return new Date(d.time + MS_MIN * x);
-		}
-		
-		/**
-		 * Adds seconds to a date instance.
-		 * @param d the date
-		 * @param x the number of seconds to add (can be negative to subtract)
-		 * @return a new Date representing the new date and time
-		 */
-		public static function addSeconds(d:Date, x:int) : Date {
-			return new Date(d.time + 1000 * x);
-		}
-		
-		// -- Time Spans ------------------------------------------------------
-				
-		/**
-		 * Rounds a date according to a particular time span. Date values are
-		 * rounded to the minimum date/time value of the time span (the first
-		 * day in a year, month, or week, or the beginning of a day, hours,
-		 * minute, second, etc).
-		 * @param t the date to round
-		 * @param span the time span to which the date should be rounded, legal
-		 *  values are YEARS, MONTHS, WEEKS, DAYS, HOURS, MINUTES, SECONDS, or
-		 *  MILLISECONDS
-		 * @param roundUp if true, the date will be rounded up to nearest value,
-		 * otherwise it will be rounded down (the default)
-		 * @return a new Date representing the rounded date and time.
-		 */
-		public static function roundTime(t:Date, span:int, roundUp:Boolean=false) : Date
-		{
-			var d:Date = t;
-			if (span > YEARS) {
-				d = new Date(t.fullYear, 0);
-				if (roundUp) d = addYears(d, 1);
-			} else if (span == MONTHS) {
-				d = new Date(t.fullYear, t.month);
-				if (roundUp) d = addMonths(d, 1);				
-			} else if (span == DAYS) {
-				d = new Date(t.fullYear, t.month, t.date);
-				if (roundUp) d = addDays(d, 1);
-			} else if (span == HOURS) {
-				d = new Date(t.fullYear, t.month, t.date, t.hours);
-				if (roundUp) d = addHours(d, 1);
-			} else if (span == MINUTES) {
-				d = new Date(t.fullYear, t.month, t.date, t.hours, t.minutes);
-				if (roundUp) d = addMinutes(d, 1);
-			} else if (span == SECONDS) {
-				d = new Date(t.fullYear, t.month, t.date, t.hours, t.minutes, t.seconds);
-				if (roundUp) d = addSeconds(d, 1);
-			} else if (span == MILLISECONDS) {
-				d = new Date(d.time + (roundUp ? 1 : -1));
-			} else if (span == WEEKS) {
-				d = new Date(t.fullYear, t.month, t.date);
-				if (roundUp) {
-					d = addDays(d, 7 - d.day);
-				} else {
-					d = addDays(d, -d.day);
-				}
-			}
-			return d;
-		}
-		
-		/**
-		 * Given two dates, returns a measure of the time span between them.
-		 * @param t the first date to compare
-		 * @param s the second date to compare
-		 * @return an integer value indicating the time span between dates. If
-		 * the return value is positive, it represents the number of years
-		 * between dates. Otherwise, the return value is one of MONTHS, DAYS,
-		 * HOURS, MINUTES, SECONDS, or MILLISECONDS.
-		 */
-		public static function timeSpan(t:Date, s:Date) : int
-		{
-			var span:Number = s.time - t.time;
-			var days:Number = span / MS_DAY;
-
-            if (days >= 365*2) 			return (1 + s.fullYear-t.fullYear);
-            else if (days >= 60)   		return MONTHS;
-            else if (span/MS_DAY > 1)	return DAYS;
-            else if (span/MS_HOUR > 1)	return HOURS;
-            else if (span/MS_MIN > 1)	return MINUTES;
-            else if (span/1000.0 > 1)	return SECONDS;
-            else						return MILLISECONDS;
-		}
-		
-		/**
-		 * Returns the number of milliseconds needed to step one time step
-		 * forward according to the given time span measure.
-		 * @param span the time span for which to return a time step value.
-		 *  Legal values are any positive numbers (representing years) or DAYS,
-		 *  HOURS, MINUTES, SECONDS, and MILLISECONDS. Note that the MONTHS
-		 *  time span is not supported and will result in a zero return value.
-		 * @return the number of milliseconds needed to more one time step
-		 *  ahead according to the input time span. For years (positive
-		 *  integer input), this step is the nearest power of ten less than the
-		 *  input value.
-		 */
-		public static function timeStep(span:int):Number {
-			if (span > YEARS) {
-				return Math.pow(10, Math.floor(Maths.log(Math.max(1,span-1),10)));
-			} else if (span == MONTHS) {
-				return 0;
-			} else if (span == DAYS) {
-				return MS_DAY;
-			} else if (span == HOURS) {
-				return MS_HOUR;
-			} else if (span == MINUTES) {
-				return MS_MIN;
-			} else if (span == SECONDS) {
-				return 1000;
-			} else {
-				return 1;
-			}
-		}
-		
-	} // end of class DateUtil
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.util/flare/util/Maths.as b/grade/report/visual/flare_visualization/flare/flare.util/flare/util/Maths.as
deleted file mode 100644
index 53f2852ab4..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.util/flare/util/Maths.as
+++ /dev/null
@@ -1,436 +0,0 @@
-package flare.util
-{
-	/**
-	 * Utility methods for mathematics not found in the <code>Math</code> class.
-	 */
-	public class Maths
-	{
-		/**
-		 * Constructor, throws an error if called, as this is an abstract class.
-		 */
-		public function Maths() {
-			throw new ArgumentError("This is an abstract class");
-		}
-		
-		// -- Operators -------------------------------------------------------
-		
-		/**
-		 * Returns the logarithm with a given base value.
-		 * @param x the number for which to compute the logarithm
-		 * @param base the base of the logarithm
-		 * @return the logarithm value
-		 */
-		public static function log(x:Number, base:Number):Number
-		{
-			return Math.log(x) / Math.log(base);
-		}
-		
-		/**
-		 * Rounds an input value down according to its logarithm. The method
-		 *  takes the floor of the logarithm of the value and then uses the
-		 *  resulting value as an exponent for the base value. For example:
-		 * <code>
-		 * trace(Maths.logFloor(13,10)); // prints "10"
-		 * trace(Maths.logFloor(113,10)); // prints "100"
-		 * </code>
-		 * @param x the number for which to compute the logarithm floor
-		 * @param base the base of the logarithm
-		 * @return the rounded-by-logarithm value
-		 */
-		public static function logFloor(x:Number, base:Number):Number {
-			if (x > 0) {
-				return Math.pow(base, Math.floor(Maths.log(x, base)));
-			} else {
-				return -Math.pow(base, -Math.floor(-Maths.log(-x, base)));
-			}
-		}
-		
-		/**
-		 * Rounds an input value up according to its logarithm. The method
-		 *  takes the ceiling of the logarithm of the value and then uses the
-		 *  resulting value as an exponent for the base value. For example:
-		 * <code>
-		 * trace(Maths.logCeil(13,10)); // prints "100"
-		 * trace(Maths.logCeil(113,10)); // prints "1000"
-		 * </code>
-		 * @param x the number for which to compute the logarithm ceiling
-		 * @param base the base of the logarithm
-		 * @return the rounded-by-logarithm value
-		 */
-		public static function logCeil(x:Number, base:Number):Number {
-			if (x > 0) {
-				return Math.pow(base, Math.ceil(Maths.log(x, base)));
-			} else {
-				return -Math.pow(base, -Math.ceil(-Maths.log(-x, base)));
-			}
-		}
-		
-		/**
-		 * Computes a zero-symmetric logarithm. Computes the logarithm of the
-		 * absolute value of the input, and determines the sign of the output
-		 * according to the sign of the input value.
-		 * @param x the number for which to compute the logarithm
-		 * @param b the base of the logarithm
-		 * @return the symmetric log value.
-		 */
-		public static function symLog(x:Number, b:Number) : Number
-        {
-            return x == 0 ? 0 : x > 0 ? log(x, b) : -log(-x, b);
-        }
-        
-        /**
-		 * Computes a zero-symmetric logarithm, with adjustment to values
-		 * between zero and the logarithm base. This adjustment introduces
-		 * distortion for values less than the base number, but enables
-		 * simultaneous plotting of log-transformed data involving both
-		 * positive and negative numbers.
-		 * @param x the number for which to compute the logarithm
-		 * @param b the base of the logarithm
-		 * @return the adjusted, symmetric log value.
-		 */
-        public static function adjLog(x:Number, b:Number) : Number
-        {
-        	var neg:Boolean = (x < 0);
-        	if (neg) x = -x;
-        	if (x < b) x += (b-x)/b;
-        	return neg ? -log(x,b) : log(x,b);
-        }
-        
-        /**
-         * Computes a zero-symmetric square root. Computes the square root of
-         * the absolute value of the input, and determines the sign of the
-         * output according to the sign of the input value.
-		 * @param x the number for which to compute the square root
-		 * @return the symmetric square root value.
-		 */
-		public static function symSqrt(x:Number) : Number
-		{
-			return (x > 0 ? Math.sqrt(x) : -Math.sqrt(-x));
-		}
-		
-		/**
-         * Computes a zero-symmetric Nth root. Computes the root of
-         * the absolute value of the input, and determines the sign of the
-         * output according to the sign of the input value.
-		 * @param x the number for which to compute the square root
-		 * @param p the root value (2 for square root, 3 for cubic root, etc)
-		 * @return the symmetric Nth root value.
-		 */
-		public static function symRoot(x:Number, p:Number) : Number
-		{
-			return (x > 0 ? Math.pow(x, 1/p) : -Math.pow(-x, 1/p));
-		}
-		
-		// -- Statistics ------------------------------------------------------
-		
-		/**
-         * Computes the n-quantile boundaries for a set of values.
-         * @param n the number of quantiles
-         * @param values the values to break into quantiles
-         * @param sort indicates if the values array needs to be sorted. If
-         *  true, the array will be sorted prior to determining quantile
-         *  boundaries. If false, the array must be in ascending sort order.
-         * @return an n-length array of quantile boundaries
-         */
-        public static function quantile(n:uint, values:Array, sort:Boolean):Array
-        {
-        	var len:uint = values.length-1;
-			var qtls:Array = new Array(n);
-			
-			if (sort) {
-            	values = Arrays.copy(values);
-            	values.sort(Array.NUMERIC);
-   			}
-   			
-            for (var i:uint=1; i <= n; ++i)
-            {
-                qtls[i-1] = values[uint((len*i)/n)];
-            }            
-            return qtls;
-        }
-		
-		
-		// -- Forward Interpolation Routines ----------------------------------
-		
-		/**
-		 * Computes a linear interpolation between two values.
-		 * @param f the interpolation fraction (typically between 0 and 1)
-		 * @param min the minimum value (corresponds to f==0)
-		 * @param max the maximum value (corresponds to f==1)
-		 * @return the interpolated value
-		 */
-		public static function linearInterp(f:Number, min:Number, max:Number):Number
-		{
-			return min + f * (max - min);
-		}
-		
-		/**
-		 * Computes a logarithmic interpolation between two values. Uses a
-		 * zero-symmetric logarithm calculation (see <code>symLog</code>).
-		 * @param f the interpolation fraction (typically between 0 and 1)
-		 * @param min the minimum value (corresponds to f==0)
-		 * @param max the maximum value (corresponds to f==1)
-		 * @param b the base of the logarithm
-		 * @return the interpolated value
-		 */
-		public static function logInterp(f:Number, min:Number, max:Number, b:Number):Number
-		{
-			min = symLog(min, b); max = symLog(max, b);
-			f = min + f * (max - min);
-			return f<0 ? -Math.pow(b, -f) : Math.pow(b, f);
-		}
-		
-		/**
-		 * Computes a logarithmic interpolation between two values. Uses an
-		 * adjusted zero-symmetric logarithm calculation (see <code>adjLog</code>).
-		 * @param f the interpolation fraction (typically between 0 and 1)
-		 * @param min the minimum value (corresponds to f==0)
-		 * @param max the maximum value (corresponds to f==1)
-		 * @param b the base of the logarithm
-		 * @return the interpolated value
-		 */
-		public static function adjLogInterp(f:Number, min:Number, max:Number, b:Number):Number
-		{
-			min = adjLog(min, b); max = adjLog(max, b);
-			f = min + f * (max - min);
-			var neg:Boolean = f < 0;
-			f = neg ? Math.pow(b, -f) : Math.pow(b, f);
-			f = b*(f-1) / (b-1);
-			return neg ? -f : f;
-		}
-		
-		/**
-		 * Computes a square root interpolation between two values. Uses a
-		 * zero-symmetric root calculation (see <code>symSqrt</code>).
-		 * @param f the interpolation fraction (typically between 0 and 1)
-		 * @param min the minimum value (corresponds to f==0)
-		 * @param max the maximum value (corresponds to f==1)
-		 * @return the interpolated value
-		 */
-		public static function sqrtInterp(f:Number, min:Number, max:Number):Number
-		{
-			min = symSqrt(min); max = symSqrt(max);
-			f = min + f * (max - min);
-			return f<0 ? -(f*f) : f*f;
-		}
-		
-		/**
-		 * Computes an Nth-root interpolation between two values. Uses a
-		 * zero-symmetric root calculation (see <code>symRoot</code>).
-		 * @param f the interpolation fraction (typically between 0 and 1)
-		 * @param min the minimum value (corresponds to f==0)
-		 * @param max the maximum value (corresponds to f==1)
-		 * @param p the root value (2 for square root, 3 for cubic root, etc)
-		 * @return the interpolated value
-		 */
-		public static function rootInterp(f:Number, min:Number, max:Number, p:Number):Number
-		{
-			min = symRoot(min, p); max = symRoot(max, p);
-			f = min + f*(max - min);
-			var neg:Boolean = f < 0;
-			return neg ? -Math.pow(-f, p) : Math.pow(f, p);
-		}
-		
-		/**
-		 * Computes an interpolated value in a quantile scale.
-		 * @param f the interpolation fraction (typically between 0 and 1)
-		 * @param quantiles an array of quantile boundaries
-		 * @return the interpolated value
-		 */
-		public static function quantileInterp(f:Number, quantiles:Array):Number
-		{
-			return quantiles[int(Math.round(f*(quantiles.length-1)))];
-		}
-		
-		
-		// -- Inverse Interpolation Routines ----------------------------------
-		
-		/**
-		 * Computes an inverse linear interpolation, returning an interpolation
-		 * fraction. Returns 0.5 if the min and max values are the same.
-		 * @param x the interpolated value
-		 * @param min the minimum value (corresponds to f==0)
-		 * @param min the maximum value (corresponds to f==1)
-		 * @return the inferred interpolation fraction
-		 */
-        public static function invLinearInterp(x:Number, min:Number, max:Number):Number
-        {
-            var denom:Number = (max - min);
-            return (denom == 0 ? 0.5 : (x - min) / denom);
-        }
-        
-        /**
-		 * Computes an inverse logarithmic interpolation, returning an
-		 * interpolation fraction. Uses a zero-symmetric logarithm.
-		 * Returns 0.5 if the min and max values are the same.
-		 * @param x the interpolated value
-		 * @param min the minimum value (corresponds to f==0)
-		 * @param min the maximum value (corresponds to f==1)
-		 * @param b the base of the logarithm
-		 * @return the inferred interpolation fraction
-		 */
-        public static function invLogInterp(x:Number, min:Number, max:Number, b:Number):Number
-        {
-            min = symLog(min, b);
-            var denom:Number = symLog(max, b) - min;
-            return (denom == 0 ? 0.5 : (symLog(x, b) - min) / denom);
-        }
-        
-        /**
-		 * Computes an inverse logarithmic interpolation, returning an
-		 * interpolation fraction. Uses an adjusted zero-symmetric logarithm.
-		 * Returns 0.5 if the min and max values are the same.
-		 * @param x the interpolated value
-		 * @param min the minimum value (corresponds to f==0)
-		 * @param min the maximum value (corresponds to f==1)
-		 * @param b the base of the logarithm
-		 * @return the inferred interpolation fraction
-		 */
-        public static function invAdjLogInterp(x:Number, min:Number, max:Number, b:Number):Number
-        {
-            min = adjLog(min, b);
-            var denom:Number = adjLog(max, b) - min;
-            return (denom == 0 ? 0.5 : (adjLog(x, b) - min) / denom);
-        }
-        
-        /**
-		 * Computes an inverse square root interpolation, returning an
-		 * interpolation fraction. Uses a zero-symmetric square root.
-		 * Returns 0.5 if the min and max values are the same.
-		 * @param x the interpolated value
-		 * @param min the minimum value (corresponds to f==0)
-		 * @param min the maximum value (corresponds to f==1)
-		 * @return the inferred interpolation fraction
-		 */
-        public static function invSqrtInterp(x:Number, min:Number, max:Number):Number
-        {
-            min = symSqrt(min);
-            var denom:Number = symSqrt(max) - min;
-            return (denom == 0 ? 0.5 : (symSqrt(x) - min) / denom);
-        }
-        
-        /**
-		 * Computes an inverse Nth-root interpolation, returning an
-		 * interpolation fraction. Uses a zero-symmetric root.
-		 * Returns 0.5 if the min and max values are the same.
-		 * @param x the interpolated value
-		 * @param min the minimum value (corresponds to f==0)
-		 * @param min the maximum value (corresponds to f==1)
-		 * @param p the root value (2 for square root, 3 for cubic root, etc)
-		 * @return the inferred interpolation fraction
-		 */
-        public static function invRootInterp(x:Number, min:Number, max:Number, p:Number):Number
-        {
-            min = symRoot(min,p);
-            var denom:Number = symRoot(max,p) - min;
-            return (denom == 0 ? 0.5 : (symRoot(x,p) - min) / denom);
-        }
-
-		/**
-		 * Computes an inverse quantile scale interpolation, returning an
-		 * interpolation fraction.
-		 * @param x the interpolated value
-		 * @param quantiles an array of quantile boundaries
-		 * @return the inferred interpolation fraction
-		 */
-		public static function invQuantileInterp(x:Number, quantiles:/*Number*/Array):Number
-        {
-            var a:uint = 0, b:uint = quantiles.length;
-            var i:uint = b / 2;
-            while (a < b)
-            {   // binary search over the boundaries
-                if (quantiles[i] == x)
-                    break;
-                else if (quantiles[i] < x)
-                    a = i+1;
-                else
-                    b = i;
-                i = a + ((b - a) >> 1);
-            }
-            return Number(i) / (quantiles.length-1);
-        }
-        
-        // -- Perlin Noise ----------------------------------------------------
-        
-        /**
-         * Computes Perlin noise for a given (x, y, z) point.
-         * @param x the x parameter
-         * @param y the y parameter (default 0)
-         * @param z the z parameter (default 0)
-         * @return Perlin noise for the input co-ordinates
-         */
-        public static function noise(x:Number, y:Number=0, z:Number=0):Number
-   		{
-   			var X:int,Y:int,Z:int,A:int,AA:int,AB:int,B:int,BA:int,BB:int;
-   			var u:Number,v:Number,w:Number,a:Number,b:Number,c:Number,d:Number;
-   			var xx:Number, yy:Number, zz:Number;
-   			
-   			X = int(x); Y = int(y); Z = int(z);
-   			x -= X;     y -= Y;     z -= Z;
-   			X &= 255;   Y &= 255;   Z &= 255;
-   			xx = x-1;   yy = y-1;   zz = z-1;
-   			
-   			u = x * x * x * (x * (x*6 - 15) + 10);
-   			v = y * y * y * (y * (y*6 - 15) + 10);
-   			w = z * z * z * (z * (z*6 - 15) + 10);
-   			
-   			A  = (_p[X  ]+Y);
-   			AA = (_p[A  ]+Z);
-   			AB = (_p[A+1]+Z);
-   			B  = (_p[X+1]+Y);
-   			BA = (_p[B  ]+Z);
-   			BB = (_p[B+1]+Z);
-   			
-   			// interpolate
-   			a =       grad(_p[AA  ], x , y , z );
-   			b =       grad(_p[AB  ], x , yy, z );
-   			c =       grad(_p[AA+1], x , y , zz);
-   			d =       grad(_p[AB+1], x , yy, zz);
-   			a += u * (grad(_p[BA  ], xx, y , z ) - a);
-   			b += u * (grad(_p[BB  ], xx, yy, z ) - b);
-   			c += u * (grad(_p[BA+1], xx, y , zz) - c);
-   			d += u * (grad(_p[BB+1], xx, yy, zz) - d);
-   			a += v * (b - a);
-   			c += v * (d - c);
-   			return a + w * (c - a);
-   		}
-   		
-		private static function grad(h:int, x:Number, y:Number, z:Number):Number
-		{
-			h &= 15;
-			var u:Number = h<8 ? x : y;
-			var v:Number = h<4 ? y : h==2||h==14 ? x : z;
-			return ((h&1) == 0 ? u : -u) + ((h&2) == 0 ? v : -v);
-		}
-		
-		private static const _p:Array = [151,160,137,91,90,15,131,13,201,95,96,
-		53,194,233,7,225,140,36,103,30,69,142,8,99,37,240,21, 10,23,190, 6,148,
-		247,120,234,75, 0,26,197,62,94,252,219,203,117,35, 11, 32,57,177,33,88,
-		237,149,56,87,174, 20,125,136,171,168, 68,175,74,165, 71,134,139,48,27,
-		166,77,146,158,231,83,111,229,122, 60,211,133,230,220,105,92, 41,55,46,
-		245,40,244,102,143,54, 65,25,63,161, 1,216,80,73,209,76,132,187,208,89,
-		18,169,200,196,135,130,116,188,159,86,164,100,109,198,173,186, 3,64,52,
-		217,226,250,124,123, 5,202,38,147,118,126,255,82,85,212,207,206,59,227,
-		47,16,58,17,182,189,28,42,223,183,170,213,119,248,152, 2,44,154,163,70,
-		221,153,101,155,167, 43,172, 9,129,22,39,253, 19,98,108,110,79,113,224,
-		232,178,185, 112,104,218,246,97,228,251,34,242,193,238,210,144, 12,191,
-		179,162,241,81,51,145,235,249,14,239,107,49,192,214,31,181,199,106,157,
-		184,84,204,176,115,121,50,45,127, 4,150,254,138,236,205,93,222,114, 67,
-		29,24,72,243,141,128,195,78,66,215,61,156,180,// now we repeat the list
-		151,160,137,91,90,15,131, 13,201,95,96,53,194,233, 7,225,140,36,103,30,
-		69,142,8,99,37,240,21, 10,23,190, 6,148,247,120,234,75, 0,26,197,62,94,
-		252,219,203,117,35,11,32,57,177,33,88,237,149,56,87,174,20,125,136,171,
-		168, 68,175,74,165,71,134,139,48, 27,166,77,146,158,231,83,111,229,122,
-		60,211,133,230,220,105,92,41,55,46,245,40,244,102,143,54, 65,25,63,161,
-		1,216, 80,73,209,76,132,187,208, 89,18,169,200,196,135,130,116,188,159,
-		86,164,100,109,198,173,186, 3,64,52,217,226,250,124,123, 5,202, 38,147,
-		118,126,255,82,85,212,207,206,59,227,47,16,58,17,182,189,28,42,223,183,
-		170,213,119,248,152, 2,44,154,163, 70,221,153,101,155,167,43,172,9,129,
-		22,39,253, 19,98,108,110,79,113,224,232,178,185,112,104,218,246,97,228,
-	   	251,34,242,193,238,210,144,12,191,179,162,241,81,51,145,235,249,14,239,
-	   	107,49,192,214, 31,181,199,106,157,184,84,204,176,115,121,50,45,127, 4,
-	   	150,254,138,236,205,93,222,114,67,29, 24,72,243,141,128,195, 78,66,215,
-	   	61,156,180];
-
-	} // end of class Maths
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.util/flare/util/Property.as b/grade/report/visual/flare_visualization/flare/flare.util/flare/util/Property.as
deleted file mode 100644
index 6a6145b5dd..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.util/flare/util/Property.as
+++ /dev/null
@@ -1,140 +0,0 @@
-package flare.util
-{	
-	/**
-	 * Utility class for accessing arbitrary property chains, allowing
-	 * nested property expressions (e.g., <code>x.a.b.c</code> or 
-	 * <code>x.a[1]</code>). To reduce initialization times, this class also
-	 * maintains a static cache of all Property instances created using the
-	 * static <code>$</code> method.
-	 */
-	public class Property
-	{
-		private static var DELIMITER:* = /[\.|\[(.*)\]]/;
-		
-		private static var __cache:Object = {};
-		private static var __stack:Array = [];
-
-		/**
-		 * Requests a Property instance for the given property name. This is a
-		 * factory method that caches and reuses property instances, saving
-		 * memory and construction time. This method is the preferred way of
-		 * getting a property and should be used instead of the constructor.
-		 * @param name the name of the property
-		 * @return the requested property instance
-		 */
-		public static function $(name:String):Property
-		{
-			if (name == null) return null;
-			var p:Property = __cache[name];
-			if (p == null) {
-				p = new Property(name);
-				__cache[name] = p;
-			}
-			return p;
-		}
-		
-		/**
-		 * Clears the cache of created Property instances
-		 */
-		public static function clearCache():void
-		{
-			__cache = {};
-		}
-
-		// --------------------------------------------------------------------
-		
-		private var _field:String;
-		private var _chain:Array;
-		private var _reset:Boolean;
-		
-		/** The property name string. */
-		public function get name():String { return _field; }
-		/** Flag indicating if all property values along a property chain
-		 *  should be reset when <code>setValue</code> is called (true by
-		 *  default). */
-		public function get reset():Boolean { return _reset; }
-		
-		// --------------------------------------------------------------------
-		
-		/**
-		 * Creates a new Property, in most cases the static <code>$</code>
-		 * method should be used instead of this constructor.
-		 * @param name the property name string
-		 * @param reset flag indicating if all properties along a chain should
-		 *  be updated when a new value is set (true by default)
-		 */
-		public function Property(name:String, reset:Boolean=true) {
-			if (name == null) {
-				throw new ArgumentError("Not a valid property name: "+name);
-			}
-			
-			_field = name;
-			_reset = reset;
-			_chain = null;
-			
-			if (_field != null) {
-				var parts:Array = _field.split(DELIMITER);
-				if (parts.length > 1) {
-					_chain = [];
-					for (var i:int=0; i<parts.length; ++i) {
-						if (parts[i].length > 0)
-							_chain.push(parts[i]);
-					}
-				}
-			}
-		}
-		
-		/**
-		 * Gets the value of this property for the input object.
-		 * @param x the object to retrieve the property value for
-		 * @return the property value
-		 */
-		public function getValue(x:Object):*
-		{
-			if (_chain == null) {
-				return x[_field];
-			} else {
-				for (var i:uint=0; i<_chain.length; ++i) {
-					x = x[_chain[i]];
-				}
-				return x;
-			}
-		}
-		
-		/**
-		 * Sets the value of this property for the input object. If the reset
-		 * flag is true, all properties along a property chain will be updated.
-		 * Otherwise, only the last property in the chain is updated.
-		 * @param x the object to set the property value for
-		 * @param val the value to set
-		 */
-		public function setValue(x:Object, val:*):void
-		{
-			if (_chain == null) {
-				x[_field] = val;
-			}
-			else if (_reset) {
-				__stack.push(x);
-				for (var i:uint=0; i<_chain.length-1; ++i) {
-					__stack.push(x = x[_chain[i]]);	
-				}
-				
-				var p:Object = __stack.pop();
-				p[_chain[i]] = val;
-				
-				for (i=_chain.length-1; --i >= 0; ) {
-					x = p;
-					p = __stack.pop();
-					p[_chain[i]] = x;
-				}
-			}
-			else {
-				for (i=0; i<_chain.length-1; ++i) {
-					x = x[_chain[i]];
-				}
-				x[_chain[i]] = val;
-			}
-		}
-		
-	} // end of class Property
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.util/flare/util/Sort.as b/grade/report/visual/flare_visualization/flare/flare.util/flare/util/Sort.as
deleted file mode 100644
index 9ef07bfcca..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.util/flare/util/Sort.as
+++ /dev/null
@@ -1,259 +0,0 @@
-package flare.util
-{
-	import flash.display.DisplayObjectContainer;
-		
-	/**
-	 * Utility class for sorting and creating sorting functions. This class
-	 * provides static methods for sorting and creating sorting comparison
-	 * functions. Instances of this class can be used to encapsulate a set of
-	 * sort criteria and retrieve a corresponding sorting function.
-	 * 
-	 * <p>Sort criteria are generally expressed as an array of property names
-	 * to sort on. These properties are accessed by sorting functions using the
-	 * <code>Property</code> class. Additionally, each property name may be
-	 * followed in the array by an optional Boolean value indicating the sort
-	 * order. A value of <code>true</code> indicates an ascending sort order,
-	 * while a value of <code>false</code> indicates a descending sort order.
-	 * </p>
-	 */
-	public class Sort
-	{
-		private var _comp:Function;
-		private var _crit:Array;
-		
-		/** Gets the sorting comparison function for this Sort instance. */
-		public function get comparator():Function { return _comp; }
-		
-		/** The sorting criteria. Sort criteria are expressed as an
-		 *  array of property names to sort on. These properties are accessed
-		 *  by sorting functions using the <code>Property</code> class.
-		 *  Additionally, each property name may be followed in the array by an
-		 *  optional Boolean value indicating the sort order. A value of
-		 *  <code>true</code> indicates an ascending sort order, while a value
-		 *  of <code>false</code> indicates a descending sort order. */
-		public function get criteria():Array { return Arrays.copy(_crit); }
-		public function set criteria(crit:*):void {
-			if (crit is String) {
-				_crit = [crit];
-			} else if (crit is Array) {
-				_crit = Arrays.copy(crit as Array);
-			} else {
-				throw new ArgumentError("Invalid Sort specification type. " +
-					"Input must be either a String or Array");
-			}
-			_comp = sorter(_crit);
-		}
-		
-		/**
-		 * Creates a new Sort instance to encapsulate sorting criteria.
-		 * @param crit the sorting criteria. Sort criteria are expressed as an
-		 *  array of property names to sort on. These properties are accessed
-		 *  by sorting functions using the <code>Property</code> class.
-		 *  Additionally, each property name may be followed in the array by an
-		 *  optional Boolean value indicating the sort order. A value of
-		 *  <code>true</code> indicates an ascending sort order, while a value
-		 *  of <code>false</code> indicates a descending sort order.
-		 */
-		public function Sort(crit:*) {
-			this.criteria = crit;
-		}
-		
-		/**
-		 * Sorts the input array according to the sort criteria.
-		 * @param list an array to sort
-		 */
-		public function sort(list:Array):void
-		{
-			mergeSort(list, comparator, 0, list.length-1);
-		}
-		
-		// --------------------------------------------------------------------
-		// Static Methods
-		
-		/**
-		 * Default comparator function that compares two values based on blind
-		 *  application of the less-than and greater-than operators.
-		 * @param a the first value to compare
-		 * @param b the second value to compare
-		 * @return -1 if a < b, 1 if a > b, 0 otherwise.
-		 */
-		public static function defaultComparator(a:*, b:*):int {
-			return a<b ? -1 : a>b ? 1 : 0;
-		}
-		
-		/**
-		 * Sorts the input array using an optional comparator function. This
-		 * method attempts to use optimized sorting routines based on the
-		 * choice of comparators.
-		 * @param list the array to sort
-		 * @param cmp an optional comparator Function or comparison
-		 *  specification. A specification is an array containing a set of data
-		 *  field names to sort on, in priority order. In addition, an optional
-		 *  boolean argument can follow each name, indicating whether sorting
-		 *  on the preceding field should be done in ascending (true) or
-		 *  descending (false) order.
-		 */
-		/*
-		public static function sort(list:Array, cmp:*=null):void
-		{
-			mergeSort(list, getComparator(cmp), 0, list.length-1);
-		}*/
-		
-		/**
-		 * Sorts the children of the given DisplayObjectContainer using
-		 * an optional comparator function.
-		 * @param d a display object container to sort. The sort may change the
-		 *  rendering order in which the contained display objects are drawn.
-		 * @param cmp an optional comparator Function or comparison
-		 *  specification. A specification is an array containing a set of data
-		 *  field names to sort on, in priority order. In addition, an optional
-		 *  boolean argument can follow each name, indicating whether sorting
-		 *  on the preceding field should be done in ascending (true) or
-		 *  descending (false) order.
-		 */
-		public static function sortChildren(
-			d:DisplayObjectContainer, cmp:*=null):void
-		{
-			if (d==null) return;
-			var a:Array = new Array(d.numChildren);
-			for (var i:int=0; i<a.length; ++i) {
-				a[i] = d.getChildAt(i);
-			}
-			if (cmp==null) a.sort() else a.sort(getComparator(cmp));
-			for (i=0; i<a.length; ++i) {
-				d.setChildIndex(a[i], i);
-			}
-		}
-		
-		private static function getComparator(cmp:*):Function
-		{
-			var c:Function;
-			if (cmp is Function) {
-				c = cmp as Function;
-			} else if (cmp is Array) {
-				c = sorter(cmp as Array);
-			} else if (cmp == null) {
-				c = defaultComparator;
-			} else {
-				throw new ArgumentError("Unknown parameter type: "+cmp);	
-			}
-			return c;
-		}
-		
-		/**
-		 * Creates a set of sorting functions using the specification given
-		 * in the input array. The resulting sorting functions can be used
-		 * to sort objects based on their properties.
-		 * @param a An array containing a set of data field
-		 * names to sort on, in priority order. In addition, an optional boolean
-		 * argument can follow each name, indicating whether sorting on the
-		 * preceding field should be done in ascending (true) or descending
-		 * (false) order.
-		 * @return a comparison function for use in sorting objects.
-		 */
-		public static function sorter(a:Array):Function
-		{
-			if (a.length < 1) {
-				throw new ArgumentError("Bad input.");	
-			} else if (a.length == 1) {
-				return sortOn(a[0], true);
-			} else if (a.length == 2 && a[1] is Boolean) {
-				return sortOn(a[0], a[1]);
-			} else {
-				var sorts:Array = new Array();
-				var field:String, asc:Boolean;
-				for (var i:uint=0; i<a.length; ++i) {
-					field = a[i];
-					asc = a[i+1] is Boolean ? a[++i] : true;
-					sorts.push(sortOn(field, asc));
-				}
-				return multisort(sorts);
-			}
-		}
-		
-		/**
-		 * Given an array of comparison functions, returns a combined
-		 * chain of comparison functions. If a comparison results in
-		 * a tie (i.e., the function returns 0), the next comparison
-		 * function in the array will be used.
-		 * @param f an array of comparison functions
-		 * @return a combined comparison function
-		 */
-		public static function multisort(f:Array):Function
-		{
-			return function(a:Object, b:Object):int {
-				var c:int;
-				for (var i:uint=0; i<f.length; ++i) {
-					if ((c = f[i](a, b)) != 0) return c;
-				}
-				return 0;
-			}
-		}
-		
-		/**
-		 * Given a property name and an ascending/descending flag,
-		 * returns a comparison function for sorting objects.
-		 * @param field the property name. This can be nested (e.g., "a.b.c").
-		 * @param asc true for an ascending sort order, false for descending.
-		 * @return a comparison function for objects
-		 */
-		public static function sortOn(field:String, asc:Boolean):Function
-		{
-			var p:Property = Property.$(field);
-			return function(a:Object, b:Object):int {
-				var da:* = p.getValue(a);
-				var db:* = p.getValue(b);
-				return (asc?1:-1)*(da > db ? 1 : da < db ? -1 : 0);
-			}
-		}
-
-		// --------------------------------------------------------------------
-
-		private static const SORT_THRESHOLD:int = 16;
-
-		private static function insertionSort(a:Array, cmp:Function, p:int, r:int):void
-		{
-			var i:int, j:int, key:Object;
-	        for (j = p+1; j<=r; ++j) {
-	        	key = a[j];
-	            i = j - 1;
-	            while (i >= p && cmp(a[i], key) > 0) {
-	                a[i+1] = a[i];
-	                i--;
-	            }
-	            a[i+1] = key;
-	        }
-    	}
-    	
-    	private static function mergeSort(a:Array, cmp:Function, p:int, r:int):void
-    	{
-	        if (p >= r) {
-	            return;
-	        }
-	        if (r-p+1 < SORT_THRESHOLD) {
-	            insertionSort(a, cmp, p, r);
-	        } else {
-	            var q:int = (p+r)/2;
-	            mergeSort(a, cmp, p, q);
-	            mergeSort(a, cmp, q+1, r);
-	            merge(a, cmp, p, q, r);
-	        }
-    	}
-
-	    private static function merge(a:Array, cmp:Function, p:int, q:int, r:int):void
-	    {
-	    	var t:Array = new Array(r-p+1);
-	    	var i:int, p1:int = p, p2:int = q+1;
-	    	
-	        for (i=0; p1<=q && p2<=r; ++i)
-	        	t[i] = cmp(a[p2], a[p1]) > 0 ? a[p1++] : a[p2++];
-	        for (; p1<=q; ++p1, ++i)
-	            t[i] = a[p1];
-	        for (; p2<=r; ++p2, ++i)
-	            t[i] = a[p2];
-	        for (i=0, p1=p; i<t.length; ++i, ++p1)
-	            a[p1] = t[i];
-	    }
-
-	} // end of class Sort
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.util/flare/util/Stats.as b/grade/report/visual/flare_visualization/flare/flare.util/flare/util/Stats.as
deleted file mode 100644
index 1c068c7ded..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.util/flare/util/Stats.as
+++ /dev/null
@@ -1,194 +0,0 @@
-package flare.util
-{
-	import flash.utils.Dictionary;
-	import flare.util.Arrays;
-	import flare.util.Property;
-	
-	/**
-	 * Utility class for computing statistics for a collection of values.
-	 */
-	public class Stats
-	{
-		/** Constant indicating numerical values. */
-		public static const NUMBER:int = 0;
-		/** Constant indicating date/time values. */
-		public static const DATE:int   = 1;
-		/** Constant indicating arbitrary object values. */
-		public static const OBJECT:int = 2;
-		
-		private var _type:int = -1;
-		private var _comp:Function = null;
-		
-		private var _num:Number = 0;
-		private var _distinct:Number = 0;
-		private var _elm:Array = null;
-		
-		private var _minObject:Object = null;
-		private var _maxObject:Object = null;
-		
-		private var _min:Number = Number.MAX_VALUE;
-		private var _max:Number = Number.MIN_VALUE;
-		private var _sum:Number = 0;
-		private var _stdev:Number = 0;
-		
-		/** The data type of the collection, one of NUMBER, DATE, or OBJECT. */
-		public function get dataType():int { return _type; }
-		/** A sorted array of all the values. */
-		public function get values():Array { return _elm; }
-		/** A sorted array of all unique values in the collection. */
-		public function get distinctValues():Array {
-			// get array with only unique items
-			var dists:Array = [];
-			if (_elm==null || _elm.length == 0) return dists;
-			dists.push(_elm[0]);
-			for (var i:int=1, j:int=0; i<_num; ++i) {
-				if (!equal(_elm[i], dists[j])) {
-					dists.push(_elm[i]); ++j;
-				}
-			}
-			return dists;
-		}
-		/** The minimum value (for numerical data). */
-		public function get minimum():Number { return _min; }
-		/** The maximum value (for numerical data). */
-		public function get maximum():Number { return _max; }
-		/** The sum of all the values (for numerical data). */
-		public function get sum():Number { return _sum; }
-		/** The average of all the values (for numerical data). */
-		public function get average():Number { return _sum / _num; }
-		/** The standard deviation of all the values (for numerical data). */
-		public function get stddev():Number { return _stdev; }
-		/** The standard error of all the values (for numerical data). */
-		public function get stderr():Number { return stddev / Math.sqrt(_num); }
-		/** The total number of values. */
-		public function get count():Number { return _num; }
-		/** The total number of distinct values. */
-		public function get distinct():Number { return _distinct; }
-		
-		/** The minimum value (for date/time values). */
-		public function get minDate():Date { return _minObject as Date; }
-		/** The maximum value (for date/time values). */
-		public function get maxDate():Date { return _maxObject as Date; }
-		
-		/** The minimum value (for arbitrary objects). */
-		public function get minObject():Object { return _minObject; }
-		/** The maximum value (for arbitrary objects). */
-		public function get maxObject():Object { return _maxObject; }
-		
-		// --------------------------------------------------------------------
-		
-		/**
-		 * Creates a new Stats instance using the given input data. If the
-		 * field argument is null, is is assumed that the input data array
-		 * directly contains the values to analyze. If the field argument is
-		 * non-null, values will be extracted from the objects in the input
-		 * array using the specified property name.
-		 * @param data an input data array. The data to analyze may be
-		 *  contained directly in the array, or may be properties of the
-		 *  objects contained in the array.
-		 * @param field a property name. This property will be used to extract
-		 *  data values from the objects in the data array. If null, the
-		 *  objects in the data array will be used directly.
-		 * @param comparator the comparator function to use to sort the data.
-		 *  If null, the natural sort order will be used.
-		 * @param copy flag indicating if the input data array should be
-		 *  copied to a new array. This flag only applied when the field
-		 *  argument is null. In false, the input data array will be sorted.
-		 *  If true, the array will be copied before being sorted. The default
-		 *  behavior is to make a copy.
-		 */
-		public function Stats(data:Array, field:String=null,
-							  comparator:Function=null, copy:Boolean=true)
-		{
-			_comp = comparator;
-			init(data, field, copy);
-		}
-		
-		private function init(data:Array, field:String, copy:Boolean):void
-		{
-			// INVARIANT: properties must be set to default values
-			// TODO: how to handle null values?
-						
-			// collect all values into element array
-			_num = data.length; if (_num==0) return;
-			_elm = (field==null ? (copy ? Arrays.copy(data) : data)
-								: new Array(_num));
-			if (field != null) {
-				var p:Property = Property.$(field);
-				for (var i:uint=0; i<_num; ++i) {
-					_elm[i] = p.getValue(data[i]);
-				}
-			}
-			
-			// determine data type
-			for (i=0; i<_num; ++i) {
-				var type:int = type(_elm[i]);
-				if (_type == -1) {
-					_type = type; // seed type
-				} else if (type != _type) {
-					_type = OBJECT; // punt if no match
-				}
-			}
-			
-			// sort data values
-			var opt:int = (_type==OBJECT ? 0 : Array.NUMERIC);
-			if (_comp==null) _elm.sort(opt); else _elm.sort(_comp, opt);
-			
-			// count unique values
-			_distinct = 1; var j:uint = 0;
-			for (i=1; i<_num; ++i) {
-				if (!equal(_elm[i], _elm[j])) { ++_distinct; j=i;	}
-			}
-			
-			// populate stats
-			var N:int = _num-1;
-			if (_type == NUMBER)
-			{
-				_min = (_minObject = _elm[0]) as Number;
-				_max = (_maxObject = _elm[N]) as Number;
-				
-				var ss:Number = 0, x:Number;
-				for each (x in _elm) {
-					_sum += x;
-					ss += x*x;
-				}
-				_stdev = Math.sqrt(ss/_num - average*average);
-			}
-			else
-			{
-				_minObject = _elm[0];
-				_maxObject = _elm[N];
-			}
-		}
-		
-		/**
-		 * Tests for equality between two values. This method is necessary
-		 * because the <code>==</code> operator checks object equality and
-		 * not value equality for <code>Date</code> instances.
-		 * @param a the first object to compare
-		 * @param b the second object to compare
-		 * @returns true if the object values are equal, false otherwise
-		 */
-		public static function equal(a:*, b:*):Boolean
-		{
-			if (a is Date && b is Date) {
-				return (a as Date).time == (b as Date).time;
-			} else {
-				return a == b;
-			}
-		}
-		
-		/**
-		 * Returns the data type of an object.
-		 * @param v the object
-		 * @returns one of NUMBER, DATE, or OBJECT
-		 */
-		public static function type(v:Object):int
-		{
-			if (v is Date) return DATE;
-			if (v is Number) return NUMBER;
-			return OBJECT;
-		}
-		
-	} // end of class Stats
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.util/flare/util/Strings.as b/grade/report/visual/flare_visualization/flare/flare.util/flare/util/Strings.as
deleted file mode 100644
index 31aeba0931..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.util/flare/util/Strings.as
+++ /dev/null
@@ -1,662 +0,0 @@
-package flare.util
-{
-	import flash.utils.ByteArray;
-	
-	/**
-	 * Utility methods for working with String instances.
-	 */
-	public class Strings
-	{	
-		/**
-		 * Constructor, throws an error if called, as this is an abstract class.
-		 */
-		public function Strings() {
-			throw new Error("This is an abstract class.");
-		}
-		
-		/**
-		 * Creates a new string by repeating an input string.
-		 * @param s the string to repeat
-		 * @param reps the number of times to repeat the string
-		 * @return a new String containing the repeated input
-		 */
-		public static function repeat(s:String, reps:int):String
-		{
-			if (reps == 1) return s;
-			
-			var b:ByteArray = new ByteArray();
-			for (var i:uint=0; i<reps; ++i)
-				b.writeUTFBytes(s);
-			b.position = 0;
-			return b.readUTFBytes(b.length);
-		}
-		
-		/**
-		 * Aligns a string by inserting padding space characters as needed.
-		 * @param s the string to align
-		 * @param align an integer indicating both the desired length of
-		 *  the string (the absolute value of the input) and the alignment
-		 *  style (negative for left alignment, positive for right alignment)
-		 * @return the aligned string, padded or truncated as necessary
-		 */
-		public static function align(s:String, align:int):String
-		{
-			var left:Boolean = align < 0;
-			var len:int = left?-align:align, slen:int = s.length;
-			if (slen > len) {
-				return left ? s.substr(0,len) : s.substr(slen-len, len);
-			} else {
-				var pad:String = repeat(' ',len-slen);
-				return left ? s + pad : pad + s;
-			}
-		}
-		
-		/**
-		 * Pads a number with a specified number of "0" digits on
-		 * the left-hand-side of the number.
-		 * @param x an input number
-		 * @param digits the number of "0" digits to pad by
-		 * @return a padded string representation of the input number
-		 */
-		public static function pad(x:Number, digits:int):String
-		{
-			var neg:Boolean = (x < 0);
-			x = Math.abs(x);
-			var e:int = 1 + int(Math.log(x) / Math.LN10);
-			var s:String = String(x);
-			for (; e<digits; e++) { s = '0' + s; }
-			return neg ? "-"+s : s;
-		}
-		
-		/**
-		 * Pads a string with zeroes up to given length.
-		 * @param s the string to pad
-		 * @param n the target length of the padded string
-		 * @return the padded string. If the input string is already equal or
-		 *  longer than n characters it is returned unaltered. Otherwise, it
-		 *  is left-padded with zeroes up to form an n-character string.
-		 */
-		public static function padString(s:String, n:int):String
-		{
-			return (s.length < n ? repeat("0",n-s.length) + s : s);
-		}
-		
-		// --------------------------------------------------------------------
-
-		/** Default formatting string for numbers. */
-		public static const DEFAULT_NUMBER:String = "0.########";
-
-		private static const _BACKSLASH :Number = '\\'.charCodeAt(0);
-		private static const _LBRACE    :Number = '{'.charCodeAt(0);
-		private static const _RBRACE    :Number = '}'.charCodeAt(0);
-		private static const _QUOTE     :Number = '"'.charCodeAt(0);
-		private static const _APOSTROPHE:Number = '\''.charCodeAt(0);
-	
-		/**
-		 * Outputs a formatted string using a set of input arguments and string
-		 * formatting directives. This method uses the String formatting
-		 * conventions of the .NET framework, providing a very flexible system
-		 * for mapping input values into various string representations. For
-		 * examples and reference documentation for string formatting options,
-		 * see
-		 * <a href="http://blog.stevex.net/index.php/string-formatting-in-csharp/">
-		 * this example page</a> or
-		 * <a href="http://msdn2.microsoft.com/en-us/library/fbxft59x.aspx">
-		 * Microsoft's documentation</a>.
-		 * @param fmt a formatting string. Format strings include markup
-		 *  indicating where input arguments should be placed in the string,
-		 *  along with optional formatting directives. For example,
-		 *  <code>{1}, {0}</code> writes out the second value argument, a
-		 *  comma, and then the first value argument.
-		 * @param args value arguments to be placed within the formatting
-		 *  string.
-		 * @return the formatted string.
-		 */
-		public static function format(fmt:String, ...args):String
-		{
-			var b:ByteArray = new ByteArray(), a:Array;
-			var esc:Boolean = false;
-			var c:Number, idx:int, ialign:int;
-			var idx0:int, idx1:int, idx2:int;
-			var s:String, si:String, sa:String, sf:String;
-			
-			for (var i:uint=0; i<fmt.length; ++i) {
-				c = fmt.charCodeAt(i);
-				if (c == _BACKSLASH) {
-					// note escape char
-					if (esc) b.writeUTFBytes('\\');
-					esc = true;
-				}
-				else if (c == _LBRACE) {
-					// process pattern
-					if (esc) {
-						b.writeUTFBytes('{');
-						esc = false;
-					} else {
-						// get pattern boundary
-						idx = fmt.indexOf("}", i);
-						if (idx < 0)
-							throw new ArgumentError("Invalid format string.");
-						
-						// extract pattern
-						s = fmt.substring(i+1, idx);
-						
-						idx2 = s.indexOf(":");
-						idx1 = s.indexOf(",");
-						idx0 = Math.min(idx1<0 ? int.MAX_VALUE : idx1,
-										idx2<0 ? int.MAX_VALUE : idx2);
-						
-						si = idx0==int.MAX_VALUE ? s : s.substring(0,idx0);
-						sa = idx1<0 || idx1 > idx2 ? null : s.substring(idx1+1, idx2<0?s.length:idx2);
-						sf = idx2<0 ? null : s.substring(idx2+1);
-						
-						try {
-							if (sa != null) { ialign = int(sa); }
-							pattern(b, sf, args[uint(si)]);
-						} catch (x:*) {
-							throw new ArgumentError("Invalid format string.");
-						}
-						i = idx;
-					}
-				} else {
-					// by default, copy value to buffer
-					b.writeUTFBytes(fmt.charAt(i));
-				}
-			}
-			
-			b.position = 0;
-			s = b.readUTFBytes(b.length);
-			
-			// finally adjust string alignment as needed
-			return (sa != null ? align(s, ialign) : s);
-		}
-			
-		private static function pattern(b:ByteArray, pat:String, value:*):void
-		{
-			if (pat == null) {
-				b.writeUTFBytes(String(value));
-			} else if (value is Date) {
-				datePattern(b, pat, value as Date);
-			} else if (value is Number) {
-				numberPattern(b, pat, Number(value));
-			} else {
-				b.writeUTFBytes(String(value));
-			}
-		}
-		
-		private static function count(s:String, c:Number, i:int):int
-		{
-			var n:int = 0;
-			for (n=0; i<s.length && s.charCodeAt(i)==c; ++i, ++n);
-			return n;
-		}
-
-		// -- Date Formatting -------------------------------------------------
-
-		/** Array of full names for days of the week. */
-		public static var DAY_NAMES:Array =
-			["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday",
-			 "Friday", "Saturday"];
-		/** Array of abbreviated names for days of the week. */
-		public static var DAY_ABBREVS:Array =
-			["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
-		/** Array of full names for months of the year. */
-		public static var MONTH_NAMES:Array =
-			["January", "February", "March", "April", "May", "June",
-			 "July", "August", "September", "October", "November", "December"];
-		/** Array of abbreviated names for months of the year. */
-		public static var MONTH_ABBREVS:Array = 
-			["Jan", "Feb", "Mar", "Apr", "May", "Jun",
-			 "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
-		/** Abbreviated string indicating "PM" time. */
-		public static var PM1:String = "P";
-		/** Full string indicating "PM" time. */
-		public static var PM2:String = "PM";
-		/** Abbreviated string indicating "AM" time. */
-		public static var AM1:String = "A";
-		/** Full string indicating "AM" time. */
-		public static var AM2:String = "AM";
-		/** String indicating "AD" time. */
-		public static var AD:String = "AD";
-		/** String indicating "BC" time. */
-		public static var BC:String = "BC";		
-
-		private static const _DATE:Number = 'd'.charCodeAt(0);
-		private static const _FRAC:Number = 'f'.charCodeAt(0);
-		private static const _FRAZ:Number = 'F'.charCodeAt(0);
-		private static const _ERA :Number = 'g'.charCodeAt(0);
-		private static const _HOUR:Number = 'h'.charCodeAt(0);
-		private static const _HR24:Number = 'H'.charCodeAt(0);
-		private static const _MINS:Number = 'm'.charCodeAt(0);
-		private static const _MOS :Number = 'M'.charCodeAt(0);
-		private static const _SECS:Number = 's'.charCodeAt(0);
-		private static const _AMPM:Number = 't'.charCodeAt(0);
-		private static const _YEAR:Number = 'y'.charCodeAt(0);
-		private static const _ZONE:Number = 'z'.charCodeAt(0);
-
-		/**
-		 * Hashtable of standard formatting flags and their formatting patterns
-		 */
-		private static const _STD_DATE:Object = {
-			d: "MM/dd/yyyy",
-			D: "dddd, dd MMMM yyyy",
-			f: "dddd, dd MMMM yyyy HH:mm",
-			F: "dddd, dd MMMM yyyy HH:mm:ss",
-			g: "MM/dd/yyyy HH:mm",
-			G: "MM/dd/yyyy HH:mm:ss",
-			M: "MMMM dd",
-			m: "MMMM dd",
-			R: "ddd, dd MMM yyyy HH':'mm':'ss 'GMT'",
-			r: "ddd, dd MMM yyyy HH':'mm':'ss 'GMT'",
-			s: "yyyy-MM-ddTHH:mm:ss",
-			t: "HH:mm",
-			T: "HH:mm:ss",
-			u: "yyyy-MM-dd HH:mm:ssZ",
-			U: "yyyy-MM-dd HH:mm:ssZ", // must convert to UTC!
-			Y: "yyyy MMMM",
-			y: "yyyy MMMM"
-		};
-
-		private static function datePattern(b:ByteArray, p:String, d:Date):void
-		{
-			var a:int, i:int, j:int, n:int, c:Number, s:String;
-			
-			// check for standard format flag, retrieve pattern if needed
-			if (p.length == 1) {
-				if (p == "U") d = Dates.toUTC(d);
-				p = _STD_DATE[p];
-				if (p == null) throw new ArgumentError("Invalid date format: "+p);
-			}
-			
-			// process custom formatting pattern
-			for (i=0; i<p.length;) {
-				c = p.charCodeAt(i);
-				for (n=0,j=i; j<p.length && p.charCodeAt(j)==c; ++j, ++n);
-				
-				if (c == _DATE) {
-					if (n >= 4) {
-						b.writeUTFBytes(DAY_NAMES[d.day]);
-					} else if (n == 3) {
-						b.writeUTFBytes(DAY_ABBREVS[d.day]);
-					} else if (n == 2) {
-						b.writeUTFBytes(pad(d.date, 2));
-					} else {
-						b.writeUTFBytes(String(d.date));
-					}
-				}
-				else if (c == _ERA) {
-					b.writeUTFBytes(d.fullYear<0 ? BC : AD);
-				}
-				else if (c == _FRAC) {
-					a = int(Math.round(Math.pow(10,n) * (d.time/1000 % 1)));
-					b.writeUTFBytes(String(a));
-				}
-				else if (c == _FRAZ) {
-					a = int(Math.round(Math.pow(10,n) * (d.time/1000 % 1)));
-					s = String(a);
-					for (a=s.length; s.charCodeAt(a-1)==_ZERO; --a);
-					b.writeUTFBytes(s.substring(0,a));
-				}
-				else if (c == _HOUR) {
-					a = (a=(int(d.hours)%12)) == 0 ? 12 : a;
-					b.writeUTFBytes(n==2 ? pad(a,2) : String(a));
-				}
-				else if (c == _HR24) {
-					a = int(d.hours);
-					b.writeUTFBytes(n==2 ? pad(a,2) : String(a));
-				}
-				else if (c == _MINS) {
-					a = int(d.minutes);
-					b.writeUTFBytes(n==2 ? pad(a,2) : String(a));
-				}
-				else if (c == _MOS) {
-					if (n >= 4) {
-						b.writeUTFBytes(MONTH_NAMES[d.month]);
-					} else if (n == 3) {
-						b.writeUTFBytes(MONTH_ABBREVS[d.month]);
-					} else {
-						a = int(d.month+1);
-						b.writeUTFBytes(n==2 ? pad(a,2) : String(a));
-					}
-				}
-				else if (c == _SECS) {
-					a = int(d.seconds);
-					b.writeUTFBytes(n==2 ? pad(a,2) : String(a));
-				}
-				else if (c == _AMPM) {
-					s = d.hours > 11 ? (n==2 ? PM2 : PM1) : (n==2 ? AM2 : AM1);
-					b.writeUTFBytes(s);
-				}
-				else if (c == _YEAR) {
-					if (n == 1) {
-						b.writeUTFBytes(String(int(d.fullYear) % 100));
-					} else {
-						a = int(d.fullYear) % int(Math.pow(10,n));
-						b.writeUTFBytes(pad(a, n));
-					}
-				}
-				else if (c == _ZONE) {
-					c = int(d.timezoneOffset / 60);
-					if (c<0) { s='+'; c = -c; } else { s='-'; }
-					b.writeUTFBytes(s + (n>1 ? pad(c, 2) : String(c)));
-					if (n >= 3) {
-						b.position = b.length;
-						c = int(Math.abs(d.timezoneOffset) % 60);
-						b.writeUTFBytes(':'+pad(c,2));
-					}
-				}
-				else if (c == _BACKSLASH) {
-					b.writeUTFBytes(p.charAt(i+1));
-					n = 2;
-				}
-				else if (c == _APOSTROPHE) {
-					a = p.indexOf('\'',i+1);
-					b.writeUTFBytes(p.substring(i+1,a));
-					n = 1 + a - i;
-				}
-				else if (c == _QUOTE) {
-					a = p.indexOf('\"',i+1);
-					b.writeUTFBytes(p.substring(i+1,a));
-					n = 1 + a - i;
-				}
-				else if (c == _PERC) {
-					if (n>1) throw new ArgumentError("Invalid date format: "+p);
-				}
-				else {
-					b.writeUTFBytes(p.substr(i,n));
-				}
-				i += n;
-			}
-		}
-		
-		// -- Number Formatting -----------------------------------------------
-		
-		private static const GROUPING:String = ';';
-		private static const _ZERO:Number = '0'.charCodeAt(0);
-		private static const _HASH:Number = '#'.charCodeAt(0);
-		private static const _PERC:Number = '%'.charCodeAt(0);
-		private static const _DECP:Number = '.'.charCodeAt(0);
-		private static const _SEPR:Number = ','.charCodeAt(0);
-		private static const _PLUS:Number = '+'.charCodeAt(0);
-		private static const _MINUS:Number = '-'.charCodeAt(0);
-		private static const _e:Number = 'e'.charCodeAt(0);
-		private static const _E:Number = 'E'.charCodeAt(0);
-		
-		/** Separator for decimal (fractional) values. */
-		public static var DECIMAL_SEPARATOR:String = '.';
-		/** Separator for thousands values. */
-		public static var THOUSAND_SEPARATOR:String = ',';
-		/** String representing Not-a-Number (NaN). */
-		public static var NaN:String = 'NaN';
-		/** String representing positive infinity. */
-		public static var POSITIVE_INFINITY:String = "+Inf";
-		/** String representing negative infinity. */
-		public static var NEGATIVE_INFINITY:String = "-Inf";
-		
-		private static const _STD_NUM:Object = {
-			c: "$#,0.", // currency
-			d: "0", // integers
-			e: "0.00e+0", // scientific
-			f: 0, // fixed-point
-			g: 0, // general
-			n: "#,##0.", // number
-			p: "%", // percent
-			//r: 0, // round-trip
-			x: 0  // hexadecimal
-		};
-		
-		private static function numberPattern(b:ByteArray, p:String, x:Number):void
-		{
-			var idx0:int, idx1:int, s:String = p.charAt(0).toLowerCase();
-			var upper:Boolean = s.charCodeAt(0) != p.charCodeAt(0);
-			
-			if (isNaN(x)) {
-				// handle NaN
-				b.writeUTFBytes(Strings.NaN);
-			}
-			else if (!isFinite(x)) {
-				// handle infinite values
-				b.writeUTFBytes(x<0 ? NEGATIVE_INFINITY : POSITIVE_INFINITY);
-			}
-			else if (p.length <= 3 && _STD_NUM[s] != null) {
-				// handle standard formatting string
-				var digits:Number = p.length==1 ? 2 : int(p.substring(1));
-				
-				if (s == 'c') {
-					digits = p.length==1 ? 2 : digits;
-					numberPattern(b, _STD_NUM[s]+repeat("0",digits), x);
-				}
-				else if (s == 'd') {
-					b.writeUTFBytes(pad(Math.round(x), digits));
-				}
-				else if (s == 'e') {
-					s = x.toExponential(digits);
-					s = upper ? s.toUpperCase() : s.toLowerCase();
-					b.writeUTFBytes(s);
-				}
-				else if (s == 'f') {
-					b.writeUTFBytes(x.toFixed(digits));
-				}
-				else if (s == 'g') {
-					var exp:Number = Math.log(Math.abs(x)) / Math.LN10;
-					exp = (exp >= 0 ? int(exp) : int(exp-1));
-					digits = (p.length==1 ? 15 : digits);
-					if (exp < -4 || exp > digits) {
-						s = upper ? 'E' : 'e';
-						numberPattern(b, "0."+repeat("#",digits)+s+"+0", x);
-					} else {
-						numberPattern(b, "0."+repeat("#",digits), x);
-					}
-				}
-				else if (s == 'n') {
-					numberPattern(b, _STD_NUM[s]+repeat("0",digits), x);
-				}
-				else if (s == 'p') {
-					numberPattern(b, _STD_NUM[s], x);
-				}
-				else if (s == 'x') {
-					s = padString(x.toString(16), digits);
-					s = upper ? s.toUpperCase() : s.toLowerCase();
-					b.writeUTFBytes(s);
-				}
-				else {
-					throw new ArgumentError("Illegal standard format: "+p);
-				}
-			}
-			else {
-				// handle custom formatting string
-				// TODO: GROUPING designator is escaped or in string literal
-				// TODO: Error handling?
-				if ((idx0=p.indexOf(GROUPING)) >= 0) {
-					if (x > 0) {
-						p = p.substring(0, idx0);
-					} else if (x < 0) {
-						idx1 = p.indexOf(GROUPING, ++idx0);
-						if (idx1 < 0) idx1 = p.length;
-						p = p.substring(idx0, idx1);
-						x = -x;
-					} else {
-						idx1 = 1 + p.indexOf(GROUPING, ++idx0);
-						p = p.substring(idx1);
-					}
-				}
-				formatNumber(b, p, x);
-			}
-		}
-		
-		/**
-		 * 0: Zero placeholder
-		 * #: Digit placeholder
-		 * .: Decimal point (any duplicates are ignored)
-		 * ,: Thosand separator + scaling
-		 * %: Percentage placeholder
-		 * e/E: Scientific notation
-		 * 
-		 * if has comma before dec point, use grouping
-		 * if grouping right before dp, divide by 1000
-		 * if percent and no e, multiply by 100
-		 */
-		private static function formatNumber(b:ByteArray, p:String, x:Number):void
-		{
-			var i:int, j:int, c:Number, n:int=1, digit:int=0;
-			var pp:int=-1, dp:int=-1, ep:int=-1, ep2:int=-1, sp:int=-1;
-			var nd:int=0, nf:int=0, ne:int=0, max:int=p.length-1;
-			var xd:int, xf:Number, xe:int=0, zd:int=0, zf:int=0;
-			var sd:String, sf:String, se:String;
-			var hash:Boolean = false;
-			
-			// ----------------------------------------------------------------
-			// first pass: extract info from the formatting pattern
-			
-			for (i=0; i<p.length; ++i) {
-				c = p.charCodeAt(i);
-				if (c == _ZERO || c == _HASH) {
-					if (dp == -1) {
-						if (nd==0) hash = true;
-						nd++;
-					} else nf++;
-				}
-				else if (c == _DECP) {
-					if (dp == -1) dp = i;
-				}
-				else if (c == _SEPR) {
-					if (sp == -1) sp = i;
-				}
-				else if (c == _PERC) {
-					if (pp == -1) pp = i;
-				}
-				else if (c == _e || c == _E) {
-					if (ep >= 0) continue;
-					ep = i;
-					if (i<max && (c=p.charCodeAt(i+1))==_PLUS || c==_MINUS) ++i;
-					for (;i<max && p.charCodeAt(i+1)==_ZERO; ++i, ++ne);
-					ep2 = i;
-					if (p.charCodeAt(ep2) != _ZERO) { ep = ep2 = -1; ne=0; }
-				}
-				else if (c == _BACKSLASH) {
-					++i;
-				}
-				else if (c == _APOSTROPHE) {
-					// skip string literal
-					for(i=i+1; i<p.length && (c==_BACKSLASH || (c=p.charCodeAt(i))!=_APOSTROPHE); ++i);
-				}
-				else if (c == _QUOTE) {
-					// skip string literal
-					for(i=i+1; i<p.length && (c==_BACKSLASH || (c=p.charCodeAt(i))!=_QUOTE); ++i);
-				}
-			}
-			
-			
-			// ----------------------------------------------------------------
-			// extract information for second pass
-			
-			// process grouping separators and thousands scaling
-			var group:Boolean = false, adj:Boolean = true;
-			if (sp >= 0) {
-				i = dp >= 0 ? dp : p.length;
-				for (; --i >= sp;) {
-					if (p.charCodeAt(i) == _SEPR) {
-						if (adj) { x /= 1000; } else { group = true; break; }
-					} else {
-						adj = false;
-					}
-				}
-			}
-			// process percentage
-			if (pp >= 0) {
-				x *= 100;
-			}
-			// process negative number
-			if (x < 0) {
-				b.writeUTFBytes('-');
-				x = Math.abs(x);
-			}
-			// process power of ten for scientific format
-			if (ep >= 0) {
-				c = Math.log(x) / Math.LN10;
-				xe = (c>=0 ? int(c) : int(c-1)) - (nd-1);
-				x = x / Math.pow(10, xe);
-			}
-			// separate number into component parts
-			xd = int(nf > 0 ? Math.floor(x) : Math.round(x));
-			xf = x - xd;
-			// create strings for integral and fractional parts
-			sd = pad(xd, nd);
-			sf = (xf+1).toFixed(nf).substring(2); // add 1 to avoid AS3 bug
-			if (hash) for (; zd<sd.length && sd.charCodeAt(zd)==_ZERO; ++zd);
-			for (zf=sf.length; --zf>=0 && sf.charCodeAt(zf)==_ZERO;);
-			
-			
-			// ----------------------------------------------------------------
-			// second pass: format the number
-			
-			var inFraction:Boolean = false;
-			for (i=0, n=0; i<p.length; ++i) {
-				c = p.charCodeAt(i);
-				if (i == dp) {
-					if (zf >= 0 || p.charCodeAt(i+1) != _HASH)
-						b.writeUTFBytes(DECIMAL_SEPARATOR);
-					inFraction = true;
-					n = 0;
-				}
-				else if (i == ep) {
-					b.writeUTFBytes(p.charAt(i));
-					if ((c=p.charCodeAt(i+1)) == _PLUS && xe > 0)
-						b.writeUTFBytes('+');
-					b.writeUTFBytes(pad(xe, ne));
-					i = ep2;
-				}
-				else if (!inFraction && n==0 && (c==_HASH || c==_ZERO)
-						 && sd.length-zd > nd) {
-					if (group) {
-						for (n=zd; n<=sd.length-nd; ++n) {
-							b.writeUTFBytes(sd.charAt(n));
-							if ((j=(sd.length-n-1)) > 0 && j%3 == 0)
-								b.writeUTFBytes(THOUSAND_SEPARATOR);
-						}	
-					} else {
-						n = sd.length - nd + 1;
-						b.writeUTFBytes(sd.substr(zd, n-zd));
-					}
-				}
-				else if (c == _HASH) {
-					if (inFraction) {
-						if (n <= zf) b.writeUTFBytes(sf.charAt(n));
-					} else if (n >= zd) {
-						b.writeUTFBytes(sd.charAt(n));
-						if (group && (j=(sd.length-n-1)) > 0 && j%3 == 0)
-							b.writeUTFBytes(THOUSAND_SEPARATOR);
-					}
-					++n;
-				}
-				else if (c == _ZERO) {
-					if (inFraction) {
-						b.writeUTFBytes(n>=sf.length ? '0' : sf.charAt(n));
-					} else {
-						b.writeUTFBytes(sd.charAt(n));
-						if (group && (j=(sd.length-n-1)) > 0 && j%3 == 0)
-							b.writeUTFBytes(THOUSAND_SEPARATOR);
-					}
-					++n;
-				}
-				else if (c == _BACKSLASH) {
-					b.writeUTFBytes(p.charAt(++i));
-				}
-				else if (c == _APOSTROPHE) {
-					for(j=i+1; j<p.length && (c==_BACKSLASH || (c=p.charCodeAt(j))!=_APOSTROPHE); ++j);
-					if (j-i > 1) b.writeUTFBytes(p.substring(i+1,j));
-					i=j;
-				}
-				else if (c == _QUOTE) {
-					for(j=i+1; j<p.length && (c==_BACKSLASH || (c=p.charCodeAt(j))!=_QUOTE); ++j);
-					if (j-i > 1) b.writeUTFBytes(p.substring(i+1,j));
-					i=j;
-				}
-				else {
-					if (c != _DECP && c != _SEPR) b.writeUTFBytes(p.charAt(i));
-				}
-			}
-		}
-		
-	} // end of class Strings
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/.actionScriptProperties b/grade/report/visual/flare_visualization/flare/flare.vis/.actionScriptProperties
deleted file mode 100644
index f72ecc3c4f..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/.actionScriptProperties
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<actionScriptProperties mainApplicationPath="flarevis.as" version="3">
-  <compiler additionalCompilerArguments="" copyDependentFiles="false" enableModuleDebug="true" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="false" htmlHistoryManagement="false" htmlPlayerVersion="9.0.28" htmlPlayerVersionCheck="true" outputFolderPath="bin" strict="true" useApolloConfig="false" verifyDigests="true" warn="true">
-    <compilerSourcePath/>
-    <libraryPath defaultLinkType="1">
-      <libraryPathEntry kind="4" path=""/>
-      <libraryPathEntry kind="3" linkType="2" path="/flare.util/bin/flare.util.swc" useDefaultLinkType="false"/>
-      <libraryPathEntry kind="3" linkType="2" path="/flare.physics/bin/flare.physics.swc" useDefaultLinkType="false"/>
-      <libraryPathEntry kind="3" linkType="2" path="/flare.animate/bin/flare.animate.swc" useDefaultLinkType="false"/>
-      <libraryPathEntry kind="3" linkType="2" path="/flare.data/bin/flare.data.swc" useDefaultLinkType="false"/>
-    </libraryPath>
-    <sourceAttachmentPath/>
-  </compiler>
-  <applications>
-    <application path="flarevis.as"/>
-  </applications>
-  <modules/>
-  <buildCSSFiles/>
-</actionScriptProperties>
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/.flexLibProperties b/grade/report/visual/flare_visualization/flare/flare.vis/.flexLibProperties
deleted file mode 100644
index 8936f474fc..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/.flexLibProperties
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<flexLibProperties version="1">
-  <includeClasses>
-    <classEntry path="flare.vis.operator.layout.AxisLayout"/>
-    <classEntry path="flare.vis.axis.AxisGridLine"/>
-    <classEntry path="flare.vis.controls.Control"/>
-    <classEntry path="flare.vis.operator.OperatorSwitch"/>
-    <classEntry path="flare.vis.data.DataSprite"/>
-    <classEntry path="flare.vis.util.TreeUtil"/>
-    <classEntry path="flare.vis.scale.LinearScale"/>
-    <classEntry path="flare.vis.controls.ControlList"/>
-    <classEntry path="flare.vis.operator.layout.RandomLayout"/>
-    <classEntry path="flare.vis.palette.SizePalette"/>
-    <classEntry path="flare.vis.controls.ExpandControl"/>
-    <classEntry path="flare.vis.util.heap.FibonacciHeap"/>
-    <classEntry path="flare.vis.operator.filter.VisibilityFilter"/>
-    <classEntry path="flare.vis.operator.layout.StackedAreaLayout"/>
-    <classEntry path="flare.vis.operator.layout.ForceDirectedLayout"/>
-    <classEntry path="flare.vis.data.NodeSprite"/>
-    <classEntry path="flare.vis.legend.Legend"/>
-    <classEntry path="flare.vis.scale.QuantileScale"/>
-    <classEntry path="flare.vis.scale.OrdinalScale"/>
-    <classEntry path="flare.vis.scale.LogScale"/>
-    <classEntry path="flare.vis.events.DataEvent"/>
-    <classEntry path="flare.vis.legend.LegendRange"/>
-    <classEntry path="flare.vis.controls.HoverControl"/>
-    <classEntry path="flare.vis.operator.layout.RadialTreeLayout"/>
-    <classEntry path="flare.vis.operator.IOperator"/>
-    <classEntry path="flare.vis.operator.layout.PieLayout"/>
-    <classEntry path="flare.vis.palette.ShapePalette"/>
-    <classEntry path="flare.vis.scale.RootScale"/>
-    <classEntry path="flare.vis.data.Tree"/>
-    <classEntry path="flare.vis.scale.ScaleType"/>
-    <classEntry path="flare.vis.scale.Scale"/>
-    <classEntry path="flare.vis.operator.Operator"/>
-    <classEntry path="flare.vis.operator.encoder.ColorEncoder"/>
-    <classEntry path="flare.vis.operator.encoder.Encoder"/>
-    <classEntry path="flare.vis.util.graphics.Transforms"/>
-    <classEntry path="flare.vis.controls.PanZoomControl"/>
-    <classEntry path="flare.vis.operator.layout.Layout"/>
-    <classEntry path="flare.vis.data.render.ShapeRenderer"/>
-    <classEntry path="flare.vis.operator.OperatorSequence"/>
-    <classEntry path="flare.vis.data.EdgeSprite"/>
-    <classEntry path="flare.vis.controls.SelectionControl"/>
-    <classEntry path="flare.vis.operator.distortion.Distortion"/>
-    <classEntry path="flare.vis.operator.filter.GraphDistanceFilter"/>
-    <classEntry path="flare.vis.events.VisualizationEvent"/>
-    <classEntry path="flare.vis.operator.OperatorList"/>
-    <classEntry path="flare.vis.palette.ColorPalette"/>
-    <classEntry path="flare.vis.operator.filter.FisheyeTreeFilter"/>
-    <classEntry path="flare.vis.scale.Scales"/>
-    <classEntry path="flare.vis.operator.layout.TreeMapLayout"/>
-    <classEntry path="flare.vis.operator.layout.DendrogramLayout"/>
-    <classEntry path="flare.vis.data.render.EdgeRenderer"/>
-    <classEntry path="flare.vis.operator.layout.CircleLayout"/>
-    <classEntry path="flare.vis.operator.encoder.SizeEncoder"/>
-    <classEntry path="flare.vis.data.Data"/>
-    <classEntry path="flare.vis.scale.IScaleMap"/>
-    <classEntry path="flare.vis.axis.AxisLabel"/>
-    <classEntry path="flare.vis.scale.TimeScale"/>
-    <classEntry path="flare.vis.util.Filters"/>
-    <classEntry path="flare.vis.operator.layout.Orientation"/>
-    <classEntry path="flare.vis.util.graphics.Geometry"/>
-    <classEntry path="flare.vis.operator.encoder.ShapeEncoder"/>
-    <classEntry path="flare.vis.controls.DragControl"/>
-    <classEntry path="flare.vis.axis.Axes"/>
-    <classEntry path="flare.vis.operator.layout.NodeLinkTreeLayout"/>
-    <classEntry path="flare.vis.legend.LegendItem"/>
-    <classEntry path="flare.vis.data.DataList"/>
-    <classEntry path="flare.vis.axis.Axis"/>
-    <classEntry path="flare.vis.controls.AnchorControl"/>
-    <classEntry path="flare.vis.util.graphics.GraphicsUtil"/>
-    <classEntry path="flare.vis.data.render.IRenderer"/>
-    <classEntry path="flare.vis.Visualization"/>
-    <classEntry path="flare.vis.scale.QuantitativeScale"/>
-    <classEntry path="flare.vis.operator.distortion.BifocalDistortion"/>
-    <classEntry path="flare.vis.data.render.NullRenderer"/>
-    <classEntry path="flare.vis.operator.layout.IndentedTreeLayout"/>
-    <classEntry path="flare.vis.util.heap.HeapNode"/>
-    <classEntry path="flare.vis.operator.encoder.PropertyEncoder"/>
-    <classEntry path="flare.vis.palette.Palette"/>
-    <classEntry path="flare.vis.operator.distortion.FisheyeDistortion"/>
-    <classEntry path="flare.vis.util.graphics.Shapes"/>
-    <classEntry path="flare.vis.axis.CartesianAxes"/>
-  </includeClasses>
-  <includeResources/>
-  <namespaceManifests>
-    <namespaceManifestEntry manifest="manifest.xml" namespace="http://flare.prefuse.org/2008/mxml"/>
-  </namespaceManifests>
-</flexLibProperties>
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/.project b/grade/report/visual/flare_visualization/flare/flare.vis/.project
deleted file mode 100644
index faee29aa8f..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/.project
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>flare.vis</name>
-	<comment></comment>
-	<projects>
-		<project>flare.animate</project>
-		<project>flare.physics</project>
-		<project>flare.util</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.adobe.flexbuilder.project.flexbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.adobe.flexbuilder.project.flexlibnature</nature>
-		<nature>com.adobe.flexbuilder.project.actionscriptnature</nature>
-	</natures>
-</projectDescription>
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/bin/flare.vis.swc b/grade/report/visual/flare_visualization/flare/flare.vis/bin/flare.vis.swc
deleted file mode 100644
index 1391b21c99..0000000000
Binary files a/grade/report/visual/flare_visualization/flare/flare.vis/bin/flare.vis.swc and /dev/null differ
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/Visualization.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/Visualization.as
deleted file mode 100644
index 09c661a0f0..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/Visualization.as
+++ /dev/null
@@ -1,233 +0,0 @@
-package flare.vis
-{
-	import flare.animate.ISchedulable;
-	import flare.animate.Scheduler;
-	import flare.animate.Transitioner;
-	import flare.vis.axis.Axes;
-	import flare.vis.axis.CartesianAxes;
-	import flare.vis.controls.ControlList;
-	import flare.vis.data.Data;
-	import flare.vis.data.Tree;
-	import flare.vis.events.DataEvent;
-	import flare.vis.events.VisualizationEvent;
-	import flare.vis.operator.OperatorList;
-	
-	import flash.display.Sprite;
-	import flash.geom.Rectangle;
-
-	/**
-	 * The Visualization class represents an interactive data visualization.
-	 * A visualization instance consists of
-	 * <ul>
-	 *  <li>A <code>Data</code> instance containing <code>DataSprite</code>
-	 *      objects that visually represent individual data elements</li>
-	 *  <li>An <code>OperatorList</code> of visualization operators that
-	 *      determine visual encodings for position, color, size and other
-	 *      properties.</li>
-	 *  <li>A <code>ControlList</code> of interactive controls that enable
-	 *      interaction with the visualized data.</li>
-	 *  <li>An <code>Axes</code> instance for presenting axes for metric
-	 *      data visualizations. Axes are often configuring automatically by
-	 *      the visualization's operators.</li>
-	 * </ul>
-	 * 
-	 * <p>Visual objects are added to the display list within the
-	 * <code>marks</code> property of the visualization, as the
-	 * <code>Data</code> object is not a <code>DisplayObjectContainer</code>.
-	 * </p>
-	 * 
-	 * <p>To create a new Visualization, load in a data set, construct
-	 * a <code>Data</code> instance, and instantiate a new
-	 * <code>Visualization</code> with the input data. Then add the series
-	 * of desired operators to the <code>operators</code> property to 
-	 * define the visual encodings.</p>
-	 * 
-	 * @see flare.vis.operator
-	 */
-	public class Visualization extends Sprite
-	{	
-		// -- Properties ------------------------------------------------------
-		
-		private var _bounds:Rectangle = new Rectangle(0,0,500,500);
-		
-		private var _marks:Sprite;
-		private var _axes:Axes;
-		private var _data:Data;
-		
-		private var _operators:OperatorList;
-		private var _controls:ControlList;
-		private var _rec:ISchedulable; // for running continuous updates
-		
-		/** The layout bounds of the visualization. This determines the layout
-		 *  region for data elements. For example, with an axis layout, the
-		 *  bounds determined the data layout region--this does not include
-		 *  space used by axis labels.
-		 */
-		public function get bounds():Rectangle { return _bounds; }
-		public function set bounds(r:Rectangle):void { _bounds = r; }
-		
-		/**
-		 * The axes for this visualization. May be null if no axes are needed.
-		 */
-		public function get axes():Axes { return _axes; }
-		public function set axes(a:Axes):void {
-			_axes = a;
-			_axes.visualization = this;
-			_axes.name = "_axes";
-			addChildAt(_axes, 0);
-		}
-		/** The axes as an x-y <code>CartesianAxes</code> instance. Returns
-		 *  null if <code>axes</code> is null or not a cartesian axes instance.
-		 */
-		public function get xyAxes():CartesianAxes { return _axes as CartesianAxes; }
-		
-		/** Sprite containing the visualization's <code>DataSprite</code>
-		 *  instances. */
-		public function get marks():Sprite { return _marks; }
-		
-		/** The visual data elements in this visualization. */
-		public function get data():Data { return _data; }
-		/** Tree structure of visual data elements in this visualization.
-		 *  Generates a spanning tree over a graph structure, if necessary. */
-		public function get tree():Tree { return _data.tree; }
-		public function set data(d:Data):void
-		{
-			if (_data != null) {
-				_data.visit(_marks.removeChild);
-				_data.removeEventListener(DataEvent.DATA_ADDED, dataAdded);
-				_data.removeEventListener(DataEvent.DATA_REMOVED, dataRemoved);
-			}
-			_data = d;
-			if (_data != null) {
-				_data.visit(_marks.addChild);
-				_data.addEventListener(DataEvent.DATA_ADDED, dataAdded);
-				_data.addEventListener(DataEvent.DATA_REMOVED, dataRemoved);
-			}
-		}
-
-		/** The operator list for defining the visual encodings. */
-		public function get operators():OperatorList { return _operators; }
-		
-		/** The control list containing interactive controls. */
-		public function get controls():ControlList { return _controls; }
-		
-		/** Flag indicating if the visualization should update with every
-		 *  frame. False by default. */
-		public function get continuousUpdates():Boolean { return _rec != null; }
-		public function set continuousUpdates(b:Boolean):void
-		{
-			if (b && _rec==null) {
-				_rec = new Recurrence(this);
-				Scheduler.instance.add(_rec);
-			}
-			else if (!b && _rec!=null) {
-				Scheduler.instance.remove(_rec);
-				_rec = null;
-			}
-		}
-		
-		// -- Methods ---------------------------------------------------------
-		
-		/**
-		 * Creates a new Visualization with the given data and axes.
-		 * @param data the <code>Data</code> instance containing the
-		 *  <code>DataSprite</code> elements in this visualization.
-		 * @param axes the <code>Axes</code> to use with this visualization.
-		 *  Null by default; layout operators may re-configure the axes.
-		 */
-		public function Visualization(data:Data=null, axes:Axes=null) {
-			addChild(_marks = new Sprite());
-			_marks.name = "_marks";
-			if (data != null) this.data = data;
-			if (axes != null) this.axes = axes;
-			
-			_operators = new OperatorList();
-			_operators.visualization = this;
-			
-			_controls = new ControlList();
-			_controls.visualization = this;
-		}
-		
-		/**
-		 * Update this visualization, re-calculating axis layout and running
-		 * the operator chain. The input transitioner is used to actually
-		 * perform value updates, enabling animated transitions. This method
-		 * also issues a <code>VisualizationEvent.UPDATE</code> event to any
-		 * registered listeners.
-		 * @param t a transitioner or time span for updating object values. If
-		 *  the input is a transitioner, it will be used to store the updated
-		 *  values. If the input is a number, a new Transitioner with duration
-		 *  set to the input value will be used. The input is null by default,
-		 *  in which case object values are updated immediately.
-		 * @return the transitioner used to store updated values.
-		 */
-		public function update(t:*=null):Transitioner
-		{
-			var trans:Transitioner = Transitioner.instance(t);
-			if (_axes != null) _axes.update(trans);
-			_operators.operate(trans);
-			if (_axes != null) _axes.update(trans);
-			fireEvent(VisualizationEvent.UPDATE, trans);
-			return trans;
-		}
-
-		// -- Event Handling --------------------------------------------------
-
-		/**
-		 * Fires a visualization event of the given type.
-		 * @param type the type of the event
-		 * @param t a transitioner that listeners should use for any value
-		 *  updates performed in response to this event
-		 */
-		protected function fireEvent(type:String, t:Transitioner):void
-		{			
-			// fire event, if anyone is listening
-			if (hasEventListener(type)) {
-				dispatchEvent(new VisualizationEvent(type, t));
-			}
-		}
-		
-		/**
-		 * Data listener invoked when new items are added to this
-		 * Visualization's <code>data</code> instance.
-		 * @param evt the data event
-		 */
-		protected function dataAdded(evt:DataEvent):void
-		{
-			if (evt.node != null) {
-				_marks.addChild(evt.node);
-			} else {
-				_marks.addChildAt(evt.item, 0);
-			}
-		}
-		
-		/**
-		 * Data listener invoked when new items are removed from this
-		 * Visualization's <code>data</code> instance.
-		 * @param evt the data event
-		 */
-		protected function dataRemoved(evt:DataEvent):void
-		{
-			_marks.removeChild(evt.item);
-		}
-
-	} // end of class Visualization
-}
-
-
-import flare.animate.ISchedulable;
-import flare.vis.Visualization;
-
-/**
- * Simple ISchedulable instance that repeatedly calls a Visualization's
- * <code>update</code> method.
- */
-class Recurrence implements ISchedulable {
-	private var v:Visualization;
-	public function Recurrence(v:Visualization) {
-		this.v = v;
-	}
-	public function evaluate(t:Number):Boolean {
-		v.update(); return false;
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/axis/Axes.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/axis/Axes.as
deleted file mode 100644
index 0a33b4a1c5..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/axis/Axes.as
+++ /dev/null
@@ -1,42 +0,0 @@
-package flare.vis.axis
-{
-	import flash.display.Sprite;
-	import flare.animate.Transitioner;
-	import flare.vis.Visualization;
-	import flash.geom.Rectangle;
-	
-	/**
-	 * Base class for representing metric data axes.
-	 */
-	public class Axes extends Sprite
-	{
-		/** The visualization the axes correspond to. */
-		protected var _vis:Visualization;
-		/** The layout bounds of the axes. */
-		protected var _bounds:Rectangle;
-		
-		/** The visualization the axes correspond to. */
-		public function get visualization():Visualization { return _vis; }
-		public function set visualization(v:Visualization):void { _vis = v; }
-
-		/** The layout bounds of the axes. If this value is not directly set,
-		 *  the layout bounds of the visualization are provided. */
-		public function get layoutBounds():Rectangle {
-			if (_bounds != null) return _bounds;
-			if (_vis != null) return _vis.bounds;
-			return null;
-		}
-		public function set layoutBounds(b:Rectangle):void { _bounds = b; }
-
-		/**
-		 * Update these axes, performing filtering and layout as needed.
-		 * @param trans a Transitioner for collecting value updates
-		 * @return the input transitioner
-		 */		
-		public function update(trans:Transitioner=null):Transitioner
-		{
-			return trans;
-		}
-		
-	} // end of class Axes
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/axis/Axis.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/axis/Axis.as
deleted file mode 100644
index c5c2de784b..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/axis/Axis.as
+++ /dev/null
@@ -1,679 +0,0 @@
-package flare.vis.axis
-{
-	import flare.animate.Transitioner;
-	import flare.display.TextSprite;
-	import flare.util.Arrays;
-	import flare.util.Stats;
-	import flare.util.Strings;
-	import flare.vis.scale.IScaleMap;
-	import flare.vis.scale.LinearScale;
-	import flare.vis.scale.LogScale;
-	import flare.vis.scale.OrdinalScale;
-	import flare.vis.scale.QuantitativeScale;
-	import flare.vis.scale.Scale;
-	
-	import flash.display.DisplayObject;
-	import flash.display.Sprite;
-	import flash.geom.Point;
-	import flash.text.TextFormat;
-	import flash.utils.Dictionary;
-
-	/**
-	 * A linear, metric data axis, consisting of axis labels and gridlines.
-	 */
-	public class Axis extends Sprite implements IScaleMap
-	{
-		// children indices
-		private static const LABELS:uint = 1;
-        private static const GRIDLINES:uint = 0;
-		
-		// axis scale
-		private var _axisScale:Scale;
-		private var _prevScale:Scale;
-		// axis settings
-		private var _xa:Number, _ya:Number;    // start of the axis
-		private var _xb:Number, _yb:Number;    // end of the axis
-		private var _xgb:Number, _ygb:Number;  // gridline bias
-		private var _xgo:Number, _ygo:Number;  // gridline offset
-		private var _xlo:Number, _ylo:Number;  // label offset
-		private var _showGrid:Boolean = true;
-		private var _showLabels:Boolean = true;
-		// gridline settings
-		private var _lineColor:uint = 0xd8d8d8;
-		private var _lineWidth:Number = 0;
-		// label settings
-		private var _fixOverlap:Boolean = true;
-		private var _numLabels:int = -1;//10;
-		private var _anchorH:int = TextSprite.LEFT;
-		private var _anchorV:int = TextSprite.TOP;
-		private var _labelAngle:Number = 0;
-		private var _labelColor:uint = 0;
-		private var _labelFormat:String = null;
-		private var _labelTextMode:int = TextSprite.BITMAP;
-		private var _labelTextFormat:TextFormat = new TextFormat("Arial",12,0);
-		// temporary variables
-		private var _point:Point = new Point();
-		
-		// -- Properties ------------------------------------------------------
-		
-		/** Sprite containing the axis labels. */
-		public function get labels():Sprite { return this.getChildAt(LABELS) as Sprite; }
-		/** Sprite containing the axis grid lines. */
-		public function get gridLines():Sprite { return this.getChildAt(GRIDLINES) as Sprite; }
-		
-		/** The Scale used to map values to this axis. */
-		public function get axisScale():Scale { return _axisScale; }
-		public function set axisScale(s:Scale):void { _axisScale = s; }
-		
-		/** @inheritDoc */
-		public function get x1():Number { return _xa; }
-		public function set x1(x:Number):void { _xa = x; }
-		
-		/** @inheritDoc */
-		public function get y1():Number { return _ya; }
-		public function set y1(y:Number):void { _ya = y; }
-		
-		/** @inheritDoc */
-		public function get x2():Number { return _xb; }
-		public function set x2(x:Number):void { _xb = x; }
-		
-		/** @inheritDoc */
-		public function get y2():Number { return _yb; }
-		public function set y2(y:Number):void { _yb = y; }
-
-		/** Flag indicating if axis labels should be shown. */
-		public function get showLabels():Boolean { return _showLabels; }
-		public function set showLabels(b:Boolean):void { _showLabels = b; }
-		
-		/** Flag indicating if labels should be removed in case of overlap. */
-		public function get fixLabelOverlap():Boolean { return _fixOverlap; }
-		public function set fixLabelOverlap(b:Boolean):void { _fixOverlap = b; }
-		
-		/** Flag indicating if axis grid lines should be shown. */
-		public function get showLines():Boolean { return _showGrid; }
-		public function set showLines(b:Boolean):void { _showGrid = b; }
-		
-		/** X-dimension length of axis gridlines. */
-		public function get lineBiasX():Number { return _xgb; }
-		public function set lineBiasX(x:Number):void { _xgb = x; }
-		
-		/** Y-dimension length of axis gridlines. */
-		public function get lineBiasY():Number { return _ygb; }
-		public function set lineBiasY(y:Number):void { _ygb = y; }
-		
-		/** X-dimension offset value for axis gridlines. */
-		public function get lineOffsetX():Number { return _xgo; }
-		public function set lineOffsetX(x:Number):void { _xgo = x; }
-		
-		/** Y-dimension offset value for axis gridlines. */
-		public function get lineOffsetY():Number { return _ygo; }
-		public function set lineOffsetY(y:Number):void { _ygo = y; }
-		
-		/** X-dimension offset value for axis labels. */
-		public function get labelOffsetX():Number { return _xlo; }
-		public function set labelOffsetX(x:Number):void { _xlo = x; }
-		
-		/** Y-dimension offset value for axis labels. */
-		public function get labelOffsetY():Number { return _ylo; }
-		public function set labelOffsetY(y:Number):void { _ylo = y; }
-		
-		/** The line color of axis grid lines. */
-		public function get lineColor():uint { return _lineColor; }
-		public function set lineColor(c:uint):void { _lineColor = c; updateGridLines(); }
-		
-		/** The line width of axis grid lines. */
-		public function get lineWidth():Number { return _lineWidth; }
-		public function set lineWidth(w:Number):void { _lineWidth = w; updateGridLines(); }
-		
-		/** The color of axis label text. */
-		public function get labelColor():uint { return _labelColor; }
-		public function set labelColor(c:uint):void { _labelColor = c; updateLabels(); }
-		
-		/** The angle (orientation) of axis label text. */
-		public function get labelAngle():Number { return _labelAngle; }
-		public function set labelAngle(a:Number):void { _labelAngle = a; updateLabels(); }
-		
-		/** TextFormat (font, size, style) for axis label text. */
-		public function get labelTextFormat():TextFormat { return _labelTextFormat; }
-		public function set labelTextFormat(f:TextFormat):void { _labelTextFormat = f; updateLabels(); }
-		
-		/** The text rendering mode to use for label TextSprites.
-		 *  @see flare.display.TextSprite. */
-		public function get labelTextMode():int { return _labelTextMode; }
-		public function set labelTextMode(m:int):void { _labelTextMode = m; updateLabels(); }
-		
-		/** String formatting pattern used for axis labels, overwrites any
-		 *  formatting pattern used by the <code>axisScale</code>. If null,
-		 *  the foramtting pattern for the <code>axisScale</code> is used. */
-		public function get labelFormat():String {
-			return _labelFormat==null ? null 
-					: _labelFormat.substring(3, _labelFormat.length-1);
-		}
-		public function set labelFormat(fmt:String):void {
-			_labelFormat = "{0:"+fmt+"}"; updateLabels();
-		}
-		
-		/** The horizontal anchor point for axis labels.
-		 *  @see flare.display.TextSprite. */
-		public function get horizontalAnchor():int { return _anchorH; }
-		public function set horizontalAnchor(a:int):void { _anchorH = a; updateLabels(); }
-		
-		/** The vertical anchor point for axis labels.
-		 *  @see flare.display.TextSprite. */
-		public function get verticalAnchor():int { return _anchorV; }
-		public function set verticalAnchor(a:int):void { _anchorV = a; updateLabels(); }		
-		
-		/** The x-coordinate of the axis origin. */
-		public function get originX():Number {
-			return (_axisScale is QuantitativeScale ? X(0) : _xa);
-		}
-		/** The y-coordinate of the axis origin. */
-		public function get originY():Number {
-			return (_axisScale is QuantitativeScale ? Y(0) : _ya);
-		}
-		
-		// -- Initialization --------------------------------------------------
-		
-		/**
-		 * Creates a new Axis.
-		 * @param axisScale the axis scale to use. If null, a linear scale
-		 *  is assumed.
-		 */
-		public function Axis(axisScale:Scale=null)
-        {
-        	if (axisScale == null)
-        		axisScale = new LinearScale();
-            _axisScale = axisScale;
-            _prevScale = axisScale;
-            initializeChildren();
-        }
-
-		/**
-		 * Initializes the child container sprites for labels and grid lines.
-		 */
-        protected function initializeChildren():void
-        {
-            addChild(new Sprite()); // add gridlines
-            addChild(new Sprite()); // add labels
-        }
-		
-		// -- Updates ---------------------------------------------------------
-		
-		/**
-		 * Updates this axis, performing filtering and layout as needed.
-		 * @param trans a Transitioner for collecting value updates
-		 * @return the input transitioner.
-		 */
-		public function update(trans:Transitioner):Transitioner
-        {
-        	var t:Transitioner = (trans!=null ? trans : Transitioner.DEFAULT);
-            filter(t);
-            layout(t);
-            updateLabels(); // TODO run through transitioner
-            return trans;
-        }
-		
-		// -- Lookups ---------------------------------------------------------
-		
-		/**
-		 * Returns the horizontal offset along the axis for the input value.
-		 * @param value an input data value
-		 * @return the horizontal offset along the axis corresponding to the
-		 *  input value. This is the x-position minus <code>x1</code>.
-		 */
-		public function offsetX(value:Object):Number
-        {
-        	return _axisScale.interpolate(value) * (_xb - _xa);
-        }
-        
-        /**
-		 * Returns the vertical offset along the axis for the input value.
-		 * @param value an input data value
-		 * @return the vertical offset along the axis corresponding to the
-		 *  input value. This is the y-position minus <code>y1</code>.
-		 */
-        public function offsetY(value:Object):Number
-        {
-        	return _axisScale.interpolate(value) * (_yb - _ya);
-        }
-
-		/** @inheritDoc */
-		public function X(value:Object):Number
-        {
-        	return _xa + offsetX(value);
-        }
-        
-        /** @inheritDoc */
-        public function Y(value:Object):Number
-        {
-        	return _ya + offsetY(value);
-        }
-        
-        /** @inheritDoc */
-        public function value(x:Number, y:Number, stayInBounds:Boolean=true):Object
-        {
-        	// project the input point onto the axis line
-        	// (P-A).(B-A) / |B-A|^2 == fractional projection onto axis line
-        	var dx:Number = (_xb-_xa);
-        	var dy:Number = (_yb-_ya);
-        	var f:Number = ((x-_xa)*dx + (y-_ya)*dy) / (dx*dx + dy*dy);
-        	// correct bounds, if desired
-        	if (stayInBounds) {
-        		if (f < 0) f = 0;
-        		if (f > 1) f = 1;
-        	}
-        	// lookup and return value
-        	return axisScale.lookup(f);
-        }
-		
-		/**
-		 * Clears the previous axis scale used, if cached.
-		 */
-		public function clearPreviousScale():void
-		{
-			_prevScale = _axisScale;
-		}
-		
-		// -- Filter ----------------------------------------------------------
-		
-		/**
-		 * Performs filtering, determining which axis labels and grid lines
-		 * should be visible.
-		 * @param trans a Transitioner for collecting value updates.
-		 */
-		protected function filter(trans:Transitioner) : void
-		{
-			var ordinal:uint = 0, i:uint, idx:int = -1, val:Object;
-			var label:AxisLabel = null;
-			var gline:AxisGridLine = null;
-			var nl:uint = labels.numChildren;
-			var ng:uint = gridLines.numChildren;
-			
-			var keepLabels:Array = new Array(nl);
-			var keepLines:Array = new Array(ng);
-			// TODO: generalize label number determination
-			var numLabels:int = _axisScale is OrdinalScale ? -1 : 10;
-			var values:Array = _axisScale.values(numLabels);
-			
-			if (_showLabels) { // process labels
-				for (i=0, ordinal=0; i<values.length; ++i) {
-					val = values[i];
-					if ((idx = findLabel(val, nl)) < 0) {
-						label = createLabel(val);
-					} else {
-						label = labels.getChildAt(idx) as AxisLabel;
-						keepLabels[idx] = true;
-					}
-					label.ordinal = ordinal++;
-				}
-			}
-			if (_showGrid) { // process gridlines
-				for (i=0, ordinal=0; i<values.length; ++i) {
-					val = values[i];
-					if ((idx = findGridLine(val, ng)) < 0) {
-						gline = createGridLine(val);
-					} else {
-						gline = gridLines.getChildAt(idx) as AxisGridLine;
-						keepLines[idx] = true;
-					}
-					gline.ordinal = ordinal++;
-				}
-			}
-			markRemovals(trans, keepLabels, labels);
-			markRemovals(trans, keepLines, gridLines);
-		}
-		
-		/**
-		 * Marks all items slated for removal from this axis.
-		 * @param trans a Transitioner for collecting value updates.
-		 * @param keep a Boolean array indicating which items to keep
-		 * @param con a container Sprite whose contents should be marked
-		 *  for removal
-		 */
-		protected function markRemovals(trans:Transitioner, keep:Array, con:Sprite) : void
-		{
-			for (var i:uint = keep.length; --i >= 0; ) {
-				if (!keep[i]) trans.removeChild(con.getChildAt(i));
-			}
-		}
-		
-		// -- Layout ----------------------------------------------------------
-		
-		/**
-		 * Performs layout, setting the position of labels and grid lines.
-		 * @param trans a Transitioner for collecting value updates.
-		 */
-		protected function layout(trans:Transitioner) : void
-		{
-			var i:uint, label:AxisLabel, gline:AxisGridLine, p:Point;
-			var _lab:Sprite = this.labels;
-			var _gls:Sprite = this.gridLines;
-			var o:Object;
-			
-			// layout labels
-			for (i=0; i<_lab.numChildren; ++i) {
-				label = _lab.getChildAt(i) as AxisLabel;
-				p = positionLabel(label, _axisScale);
-				
-				o = trans.$(label);
-				o.x = p.x;
-				o.y = p.y;
-				o.alpha = trans.willRemove(label) ? 0 : 1;
-			}
-			// fix label overlap
-			if (_fixOverlap) fixOverlap(trans);
-			// layout gridlines
-			for (i=0; i<_gls.numChildren; ++i) {
-				gline = _gls.getChildAt(i) as AxisGridLine;
-				p = positionGridLine(gline, _axisScale);
-				
-				o = trans.$(gline);
-				o.x1 = p.x;
-				o.y1 = p.y;
-				o.x2 = p.x + _xgb - _xgo;
-				o.y2 = p.y + _ygb - _ygo;
-				o.alpha = trans.willRemove(gline) ? 0 : 1;
-			}
-			// update previous scale
-			_prevScale = _axisScale.clone(); // clone as IScale
-		}
-		
-		// -- Label Overlap ---------------------------------------------------
-		
-		/**
-		 * Eliminates overlap between labels along an axis. 
-		 * @param trans a transitioner, potentially storing label positions
-		 */		
-		protected function fixOverlap(trans:Transitioner):void
-		{
-			var labs:Array = [], d:DisplayObject, i:int;
-			// collect and sort labels
-			for (i=0; i<labels.numChildren; ++i) {
-				var s:AxisLabel = AxisLabel(labels.getChildAt(i));
-				if (!trans.willRemove(s)) labs.push(s);
-			}
-			if (labs.length == 0) return;
-			labs.sortOn("ordinal", Array.NUMERIC);
-			
-			// stores the labels to remove
-			var rem:Dictionary = new Dictionary();
-			
-			if (_axisScale is LogScale) {
-				fixLogOverlap(labs, rem, trans, LogScale(_axisScale));
-			}
-			
-			// maintain min and max if we get down to two
-			i = labs.length;
-			var min:Object = labs[0];
-			var max:Object = labs[i-1];
-			var mid:Object = (i&1) ? labs[(i>>1)] : null;
-
-			// fix overlap with an iterative optimization
-			// remove every other label with each iteration
-			while (hasOverlap(labs, trans)) {
-				// reduce labels
-				i = labs.length;
-				if (mid && i>3 && i<8) { // use min, med, max if we can
-					for each (d in labs) rem[d] = d;
-					if (rem[min]) delete rem[min];
-					if (rem[max]) delete rem[max];
-					if (rem[mid]) delete rem[mid];
-					labs = [min, mid, max];
-				}
-				else if (i < 4) { // use min and max if we're down to two
-					if (rem[min]) delete rem[min];
-					if (rem[max]) delete rem[max];
-					for each (d in labs) {
-						if (d != min && d != max) rem[d] = d;
-					}
-					break;
-				}
-				else { // else remove every odd element
-					i = i - (i&1 ? 2 : 1);
-					for (; i>0; i-=2) {
-						rem[labs[i]] = labs[i];
-						labs.splice(i, 1); // remove from array
-					}
-				}
-			}
-			
-			// remove the deleted labels
-			for each (d in rem) {
-				trans.$(d).alpha = 0;
-				trans.removeChild(d, true);
-			}
-		}
-		
-		private static function fixLogOverlap(labs:Array, rem:Dictionary,
-			trans:Transitioner, scale:LogScale):void
-		{
-				var base:int = int(scale.base), i:int, j:int, zidx:int;
-				if (!hasOverlap(labs, trans)) return;
-				
-				// find zero
-				zidx = Arrays.binarySearch(labs, 0, "value");
-				var neg:Boolean = scale.dataMin < 0;
-				var pos:Boolean = scale.dataMax > 0;
-				
-				// if includes negative, traverse backwards from zero/end
-				if (neg) {
-					i = (zidx<0 ? labs.length : zidx) - (pos ? 1 : 2);
-					for (j=pos?1:2; i>=0; ++j, --i) {
-						if (j == base) {
-							j = 1;
-						} else {
-							rem[labs[i]] = labs[i];
-							labs.splice(i, 1); --zidx;
-						}
-					}
-				}
-				// if includes positive, traverse forwards from zero/start
-				if (pos) {
-					i = (zidx<0 ? 0 : zidx+1) + (neg ? 0 : 1);
-					for (j=neg?1:2; i<labs.length; ++j) {
-						if (j == base) {
-							j = 1; ++i;
-						} else {
-							rem[labs[i]] = labs[i];
-							labs.splice(i, 1);
-						}
-					}
-				}
-		}
-		
-		private static function hasOverlap(labs:Array, trans:Transitioner):Boolean
-		{
-			var d:DisplayObject = labs[0], e:DisplayObject;
-			for (var i:int=1; i<labs.length; ++i) {
-				if (overlaps(trans, d, (e=labs[i]))) return true;
-				d = e;
-			}
-			return false;
-		}
-		
-		/**
-		 * Indicates if two display objects overlap, sensitive to any target
-		 * values stored in a transitioner.
-		 * @param trans a Transitioner, potentially with target values
-		 * @param l1 a display object
-		 * @param l2 a display object
-		 * @return true if the objects overlap (considering values in the
-		 *  transitioner, if appropriate), false otherwise
-		 */
-		private static function overlaps(trans:Transitioner,
-			l1:DisplayObject, l2:DisplayObject):Boolean
-		{
-			if (trans.immediate) return l1.hitTestObject(l2);
-			// get original co-ordinates
-			var xa:Number = l1.x, ya:Number = l1.y;
-			var xb:Number = l2.x, yb:Number = l2.y;
-			var o:Object;
-			// set to target co-ordinates
-			o = trans.$(l1); l1.x = o.x; l1.y = o.y;
-			o = trans.$(l2); l2.x = o.x; l2.y = o.y;
-			// compute overlap
-			var b:Boolean = l1.hitTestObject(l2);
-			// reset to original coordinates
-			l1.x = xa; l1.y = ya; l2.x = xb; l2.y = yb;
-			return b;
-		}
-		
-		// -- Axis Label Helpers ----------------------------------------------
-		
-		/**
-		 * Creates a new axis label.
-		 * @param val the value to create the label for
-		 * @return an AxisLabel
-		 */		
-		protected function createLabel(val:Object) : AxisLabel
-		{
-			var label:AxisLabel = new AxisLabel();
-			label.alpha = 0;
-			label.value = val;
-			var p:Point = positionLabel(label, _prevScale);
-			label.x = p.x;
-			label.y = p.y;
-			updateLabel(label);
-			labels.addChild(label);
-			return label;
-		}
-		
-		/**
-		 * Computes the position of an axis label.
-		 * @param label the axis label to layout
-		 * @param scale the scale used to map values to the axis
-		 * @return a Point with x,y coordinates for the axis label
-		 */
-		protected function positionLabel(label:AxisLabel, scale:Scale) : Point
-		{
-			var f:Number = scale.interpolate(label.value);
-			_point.x = _xlo + _xa + f*(_xb-_xa);
-			_point.y = _ylo + _ya + f*(_yb-_ya);
-			return _point;
-		}
-		
-		/**
-		 * Updates an axis label's settings
-		 * @param label the label to update
-		 */		
-		protected function updateLabel(label:AxisLabel) : void
-		{
-			label.setTextFormat(_labelTextFormat);
-			label.horizontalAnchor = _anchorH;
-			label.verticalAnchor = _anchorV;
-			label.rotation = (180/Math.PI) * _labelAngle;
-			label.textMode = _labelTextMode;
-			label.text = _labelFormat==null ? axisScale.label(label.value)
-					   : Strings.format(_labelFormat, label.value);
-		}
-		
-		/**
-		 * Updates all axis labels.
-		 */		
-		protected function updateLabels() : void
-		{
-			var _labels:Sprite = this.labels;
-			for (var i:uint = 0; i<_labels.numChildren; ++i) {
-				updateLabel(_labels.getChildAt(i) as AxisLabel);
-			}
-		}
-		
-		/**
-		 * Returns the index of a label in the label's container sprite for a
-		 * given data value.
-		 * @param val the data value to find
-		 * @param len the number of labels to check
-		 * @return the index of a label with matching value, or -1 if no label
-		 *  was found
-		 */		
-		protected function findLabel(val:Object, len:uint) : int
-		{
-			var _labels:Sprite = this.labels;
-			for (var i:uint = 0; i < len; ++i) {
-				// TODO: make this robust to repeated values
-				if (Stats.equal((_labels.getChildAt(i) as AxisLabel).value, val)) {
-					return i;
-				}
-			}
-			return -1;
-		}
-		
-		// -- Axis GridLine Helpers -------------------------------------------
-		
-		/**
-		 * Creates a new axis grid line.
-		 * @param val the value to create the grid lines for
-		 * @return an AxisGridLine
-		 */	
-		protected function createGridLine(val:Object) : AxisGridLine
-		{
-			var gline:AxisGridLine = new AxisGridLine();
-			gline.alpha = 0;
-			gline.value = val;
-			var p:Point = positionGridLine(gline, _prevScale);
-			gline.x1 = p.x;
-			gline.y1 = p.y;
-			gline.x2 = gline.x1 + _xgb;
-			gline.y2 = gline.y1 + _ygb;	
-			updateGridLine(gline);
-			gridLines.addChild(gline);
-			return gline;
-		}
-		
-		/**
-		 * Computes the position of an axis grid line.
-		 * @param gline the axis grid line to layout
-		 * @param scale the scale used to map values to the axis
-		 * @return a Point with x,y coordinates for the axis grid line
-		 */
-		protected function positionGridLine(gline:AxisGridLine, scale:Scale) : Point
-		{
-			var f:Number = scale.interpolate(gline.value);
-			_point.x = _xgo + _xa + f*(_xb - _xa);
-			_point.y = _ygo + _ya + f*(_yb - _ya);
-			return _point;
-		}
-		
-		/**
-		 * Updates an axis grid line's settings
-		 * @param gline the grid line to update
-		 */
-		protected function updateGridLine(gline:AxisGridLine) : void
-		{
-			gline.lineColor = _lineColor;
-			gline.lineWidth = _lineWidth;
-		}
-		
-		/**
-		 * Updates all grid lines.
-		 */
-		protected function updateGridLines() : void
-		{
-			var _glines:Sprite = this.gridLines;
-			for (var i:uint = 0; i<_glines.numChildren; ++i) {
-				updateGridLine(_glines.getChildAt(i) as AxisGridLine);
-			}
-		}
-		
-		/**
-		 * Returns the index of a grid lines in the line's container sprite
-		 * for a given data value.
-		 * @param val the data value to find
-		 * @param len the number of grid lines to check
-		 * @return the index of a grid line with matching value, or -1 if no
-		 *  grid line was found
-		 */	
-		protected function findGridLine(val:Object, len:uint) : int
-		{
-			var _glines:Sprite = this.gridLines;
-			for (var i:uint = 0; i<len; ++i) {
-				// TODO: make this robust to repeated values
-				if (Stats.equal((_glines.getChildAt(i) as AxisGridLine).value, val)) {
-					return i;
-				}
-			}
-			return -1;
-		}
-		
-	} // end of class Axis
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/axis/AxisGridLine.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/axis/AxisGridLine.as
deleted file mode 100644
index 7883bc513e..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/axis/AxisGridLine.as
+++ /dev/null
@@ -1,22 +0,0 @@
-package flare.vis.axis
-{
-	import flare.display.LineSprite;
-
-	/**
-	 * Axis grid line in an axis display.
-	 */
-	public class AxisGridLine extends LineSprite
-	{
-		private var _ordinal:int;
-		private var _value:Object;
-
-		/** The ordinal index of this grid line in the list of grid lines. */
-		public function get ordinal():int { return _ordinal; }
-		public function set ordinal(ord:int):void { _ordinal = ord; }
-		
-		/** The data value represented by this axis grid line. */
-		public function get value():Object { return _value; }
-		public function set value(value:Object):void { _value = value; }
-		
-	} // end of class AxisGridLine
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/axis/AxisLabel.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/axis/AxisLabel.as
deleted file mode 100644
index 1645067ffd..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/axis/AxisLabel.as
+++ /dev/null
@@ -1,22 +0,0 @@
-package flare.vis.axis
-{
-	import flare.display.TextSprite;
-	
-	/**
-	 * Axis label in an axis display.
-	 */
-	public class AxisLabel extends TextSprite
-	{
-		private var _ordinal:int;
-		private var _value:Object;
-
-		/** The ordinal index of this axis label in the list of labels. */
-		public function get ordinal():int { return _ordinal; }
-		public function set ordinal(ord:int):void { _ordinal = ord; }
-		
-		/** The data value represented by this axis label. */
-		public function get value():Object { return _value; }
-		public function set value(value:Object):void { _value = value; }
-		
-	} // end of class AxisLabel
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/axis/CartesianAxes.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/axis/CartesianAxes.as
deleted file mode 100644
index 360c14a588..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/axis/CartesianAxes.as
+++ /dev/null
@@ -1,190 +0,0 @@
-package flare.vis.axis
-{
-	import flare.animate.Transitioner;
-	import flare.display.RectSprite;
-	import flare.display.TextSprite;
-	import flare.vis.Visualization;
-	
-	import flash.geom.Rectangle;
-	
-	/**
-	 * Axes class representing 2D Cartesian (X-Y) axes.
-	 */
-	public class CartesianAxes extends Axes
-	{
-		// -- Properties ------------------------------------------------------
-				
-		private var _xaxis:Axis;
-		private var _yaxis:Axis;
-		private var _xline:AxisGridLine;
-		private var _yline:AxisGridLine;
-		private var _showXLine:Boolean;
-		private var _showYLine:Boolean;
-		private var _border:RectSprite;
-		private var _xrev:Boolean = false;
-		private var _yrev:Boolean = false;
-		
-		/** The x-axis. */
-		public function get xAxis():Axis { return _xaxis; }
-		/** The y-axis. */
-		public function get yAxis():Axis { return _yaxis; }
-		/** Grid line for the origin along the x-axis. */
-		public function get xLine():AxisGridLine { return _xline; }
-		/** Grid line for the origin along the y-axis. */
-		public function get yLine():AxisGridLine { return _yline; }
-		
-		/** Determines if the x-axis should be in reverse order. */
-		public function get xReverse():Boolean { return _xrev; }
-		public function set xReverse(b:Boolean):void { _xrev = b; }
-		
-		/** Determines if the y-axis should be in reverse order. */
-		public function get yReverse():Boolean { return _yrev; }
-		public function set yReverse(b:Boolean):void { _yrev = b; }
-		
-		/** The x-coordinate of the axes' origin point. */
-		public function get originX():Number { return _xaxis.originX; }
-		/** The y-coordinate of the axes' origin point. */
-		public function get originY():Number { return _yaxis.originY; }
-		
-		/** Flag indicating if the x-origin line should be shown. */
-		public function get showXLine():Boolean { return _showXLine; }
-		public function set showXLine(b:Boolean):void { _showXLine = b; }
-		
-		/** Flag indicating if the y-origin line should be shown. */
-		public function get showYLine():Boolean { return _showYLine; }
-		public function set showYLine(b:Boolean):void { _showYLine = b; }
-		
-		/** Flag indicating if a border for the axes should be shown. */
-		public function get showBorder():Boolean { return _border.visible; }
-		public function set showBorder(b:Boolean):void { _border.visible = b; }
-		
-		/** The axes border color. */
-		public function get borderColor():uint { return _border.lineColor; }
-		public function set borderColor(c:uint):void { _border.lineColor = c; }
-		
-		/** The line width of the axes border. */
-		public function get borderWidth():Number { return _border.lineWidth; }
-		public function set borderWidth(w:Number):void { _border.lineWidth = w; }
-		
-				
-		// -- Methods ---------------------------------------------------------
-		
-		/**
-		 * Creates new CartesianAxes.
-		 * @param vis the visualization the axes correspond to.
-		 */
-		public function CartesianAxes(vis:Visualization=null) {
-			_vis = vis;
-			
-			addChild(_xaxis = new Axis());
-			addChild(_yaxis = new Axis());
-			addChild(_xline = new AxisGridLine());
-			addChild(_yline = new AxisGridLine());
-			addChild(_border = new RectSprite());
-			
-			// set names
-			_xaxis.name = "_xaxis";
-			_yaxis.name = "_yaxis";
-			_xline.name = "_xline";
-			_yline.name = "_yline";
-			_border.name = "_border";
-			
-			// set label anchors
-			_xaxis.horizontalAnchor = TextSprite.CENTER;
-			_xaxis.verticalAnchor   = TextSprite.TOP;
-			_yaxis.horizontalAnchor = TextSprite.RIGHT;
-			_yaxis.verticalAnchor   = TextSprite.MIDDLE;
-            
-            // set default label offsets
-            _xaxis.labelOffsetX =  0; _xaxis.labelOffsetY = 8;
-            _yaxis.labelOffsetX = -8; _yaxis.labelOffsetY = 0;
-
-            // set default gridline offsets
-            _xaxis.lineOffsetX =  0; _xaxis.lineOffsetY = 5;
-            _yaxis.lineOffsetX = -5; _yaxis.lineOffsetY = 0;
-
-            // set default gridline colors
-            _xaxis.lineColor = 0xd8d8d8;
-            _yaxis.lineColor = 0xd8d8d8;
-
-            // set default line settings
-            _xline.lineColor = 0xcccccc;
-            _yline.lineColor = 0xcccccc;
-            
-            // set up border
-            _border.lineColor = 0xffd8d8d8;
-            _border.fillColor = 0x00ffffff;
-		}
-		
-		/** @inheritDoc */
-		public override function update(trans:Transitioner=null):Transitioner
-        {
-        	var t:Transitioner = (trans!=null ? trans : Transitioner.DEFAULT);
-        	var o:Object;
-        	var b:Rectangle = layoutBounds.clone();
-        	
-        	// set x-axis position
-        	if (_xrev) {
-        		_xaxis.x1 = b.right; _xaxis.y1 = b.bottom;
-        		_xaxis.x2 = b.left;  _xaxis.y2 = b.bottom;
-        	} else {
-        		_xaxis.x1 = b.left;  _xaxis.y1 = b.bottom;
-        		_xaxis.x2 = b.right; _xaxis.y2 = b.bottom;
-        	}
-
-			// set y-axis position
-			if (_yrev) {
-				_yaxis.x1 = b.left;  _yaxis.y1 = b.top;
-        		_yaxis.x2 = b.left;  _yaxis.y2 = b.bottom;
-   			} else {
-   				_yaxis.x1 = b.left;  _yaxis.y1 = b.bottom;
-        		_yaxis.x2 = b.left;  _yaxis.y2 = b.top;
-   			}
-        	
-        	// gridline bias
-        	_xaxis.lineBiasX = 0; _xaxis.lineBiasY = -b.height;
-        	_yaxis.lineBiasX = b.width; _yaxis.lineBiasY = 0;
-
-			// update axes
-			_xaxis.update(t);
-			_yaxis.update(t);
-
-			// update x-axis origin line
-			var yx:Number = _yaxis.offsetX(0);
-			var yy:Number = _yaxis.offsetY(0);
-			var ys:Boolean = _showXLine && yx >= 0 && yx <= b.width;
-			o = t.$(_xline);
-			o.x1 = _xaxis.x1 + yx;
-			o.y1 = _xaxis.y1 + yy;
-			o.x2 = _xaxis.x2 + yx;
-			o.y2 = _xaxis.y2 + yy;
-			o.alpha = ys ? 1 : 0;
-			
-			// update y-axis origin line
-			var xx:Number = _xaxis.offsetX(0);
-			var xy:Number = _xaxis.offsetY(0);
-			var xs:Boolean = _showYLine && xy >= 0 && xy <= b.height;
-			o = t.$(_yline);
-			o.x1 = _yaxis.x1 + xx;
-			o.y1 = _yaxis.y1 + xy;
-			o.x2 = _yaxis.x2 + xx;
-			o.y2 = _yaxis.y2 + xy;
-			o.alpha = xs ? 1 : 0;
-
-			// update axis border
-			o = t.$(_border);
-			o.x = b.x;
-			o.y = b.y;
-			o.w = b.width;
-			o.h = b.height;
-			
-			// set the gridline clipping region
-			b.width += 1; b.height += 1;
-			_xaxis.gridLines.scrollRect = b;
-			_yaxis.gridLines.scrollRect = b;
-
-            return trans;
-        }
-		
-	} // end of class CartesianAxes
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/controls/AnchorControl.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/controls/AnchorControl.as
deleted file mode 100644
index 4393d8117a..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/controls/AnchorControl.as
+++ /dev/null
@@ -1,72 +0,0 @@
-package flare.vis.controls
-{
-	import flare.vis.Visualization;
-	import flare.vis.operator.layout.Layout;
-	
-	import flash.display.InteractiveObject;
-	import flash.events.Event;
-	import flash.events.MouseEvent;
-	import flash.geom.Point;
-	
-	/**
-	 * An interactive control that updates a layout's anchor point in response
-	 * to mouse movement. This control is often used to dynamically update a
-	 * focus+context distortion.
-	 */
-	public class AnchorControl extends Control
-	{
-		private var _layout:Layout;
-		
-		public function get layout():Layout { return _layout; }
-		public function set layout(l:Layout):void { _layout = l; }
-		
-		/** Update function called when the layout anchor changes. */
-		public var update:Function = function():void {
-			Visualization(_object).update();
-		}
-		
-		/**
-		 * Creates a new AnchorControl
-		 */
-		public function AnchorControl(vis:Visualization=null, layout:Layout=null)
-		{
-			_layout = layout;
-			attach(vis);
-		}
-		
-		/** @inheritDoc */
-		public override function attach(obj:InteractiveObject):void
-		{
-			super.attach(obj);
-			if (obj != null) {
-				obj.addEventListener(Event.ENTER_FRAME, updateMouse);
-			}
-		}
-		
-		/** @inheritDoc */
-		public override function detach():InteractiveObject
-		{
-			if (_object != null) {
-				_object.removeEventListener(Event.ENTER_FRAME, updateMouse);
-			}
-			return super.detach();
-		}
-		
-		/**
-		 * Causes the layout anchor to be updated according to the current
-		 * mouse position.
-		 * @param evt an optional mouse event
-		 */
-		public function updateMouse(evt:Event=null):void
-		{
-			// get current anchor, run update if changed
-			var p1:Point = _layout.layoutAnchor;
-			_layout.layoutAnchor = new Point(_object.mouseX, _object.mouseY);
-			// distortion might snap the anchor to the layout bounds
-			// so we need to re-retrieve the point to ensure accuracy
-			var p2:Point = _layout.layoutAnchor;
-			if (p1.x != p2.x || p1.y != p2.y) update();
-		}
-		
-	} // end of class AnchorControl
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/controls/Control.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/controls/Control.as
deleted file mode 100644
index 3aa648f4bc..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/controls/Control.as
+++ /dev/null
@@ -1,49 +0,0 @@
-package flare.vis.controls
-{
-	import flash.display.InteractiveObject;
-
-	/**
-	 * Abstract class which interactive controls can inherit.
-	 */
-	public class Control implements IControl
-	{
-		/** @private */
-		protected var _object:InteractiveObject;
-		
-		/**
-		 * Creates a new Control
-		 */
-		public function Control() {
-			// do nothing
-		}
-		
-		/** @inheritDoc */
-		public function get object():InteractiveObject
-		{
-			return _object;
-		}
-		
-		/** @inheritDoc */
-		public function attach(obj:InteractiveObject):void
-		{
-			_object = obj;
-		}
-		
-		/** @inheritDoc */
-		public function detach():InteractiveObject
-		{
-			var obj:InteractiveObject = _object;
-			_object = null;	
-			return obj;
-		}
-		
-		// -- MXML ------------------------------------------------------------
-		
-		/** @private */
-		public function initialized(document:Object, id:String):void
-		{
-			// do nothing
-		}
-		
-	} // end of class Control
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/controls/ControlList.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/controls/ControlList.as
deleted file mode 100644
index 531e19925f..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/controls/ControlList.as
+++ /dev/null
@@ -1,159 +0,0 @@
-package flare.vis.controls
-{
-	import flare.util.Arrays;
-	import flare.vis.Visualization;
-	
-	import flash.utils.flash_proxy;
-	import flash.utils.Proxy;
-	
-	import mx.core.IMXMLObject;
-	
-	/**
-	 * A ControlList maintains a sequential chain of controls for interacting
-	 * with a visualization. Controls may perform operations such as selection,
-	 * panning, zooming, and expand/contract. Controls can be added to a
-	 * ControlList using the <code>add</code> method. Once added, controls can be
-	 * retrieved and set using their index in the lists, either with array
-	 * notation (<code>[]</code>) or with the <code>getControlAt</code> and
-	 * <code>setControlAt</code> methods.
-	 */
-	public class ControlList extends Proxy implements IMXMLObject
-	{
-		protected var _vis:Visualization;
-		protected var _list:/*IControl*/Array = [];
-		
-		/** The visualization manipulated by these controls. */
-		public function get visualization():Visualization { return _vis; }
-		public function set visualization(v:Visualization):void { 
-			_vis = v;
-			for each (var ic:IControl in _list) { ic.attach(v);	}
-		}
-		
-		/** An array of the controls contained in the control list. */
-		public function set list(ctrls:Array):void {
-			// first remove all current operators
-			while (_list.length > 0) {
-				removeControlAt(_list.length-1);
-			}
-			// then add the new operators
-			for each (var ic:IControl in ctrls) {
-				add(ic);
-			}
-		}
-		
-		/** The number of controls in the list. */
-		public function get length():uint { return _list.length; }
-		
-		// --------------------------------------------------------------------
-		
-		/**
-		 * Creates a new ControlList.
-		 * @param ops an ordered set of controls to include in the list.
-		 */
-		public function ControlList(...controls) {
-			for each (var ic:IControl in controls) {
-				add(ic);
-			}
-		}
-		
-		/**
-		 * Proxy method for retrieving controls from the internal array.
-		 */
-		flash_proxy override function getProperty(name:*):*
-		{
-    		return _list[name];
-    	}
-
-		/**
-		 * Proxy method for setting controls in the internal array.
-		 */
-    	flash_proxy override function setProperty(name:*, value:*):void
-    	{
-        	if (value is IControl) {
-        		var ic:IControl = IControl(value);
-        		_list[name].detach();
-        		_list[name] = ic;
-        		ic.attach(_vis);
-        	} else {
-        		throw new ArgumentError("Input value must be an IControl.");
-        	}
-    	}
-		
-		/**
-		 * Returns the control at the specified position in the list
-		 * @param i the index into the control list
-		 * @return the requested control
-		 */
-		public function getControlAt(i:uint):IControl
-		{
-			return _list[i];
-		}
-		
-		/**
-		 * Removes the control at the specified position in the list
-		 * @param i the index into the control list
-		 * @return the removed control
-		 */
-		public function removeControlAt(i:uint):IControl
-		{
-			var ic:IControl = Arrays.removeAt(_list, i) as IControl;
-			if (ic) ic.detach();
-			return ic;
-		}
-		
-		/**
-		 * Set the control at the specified position in the list
-		 * @param i the index into the control list
-		 * @param ic the control to place in the list
-		 * @return the control previously at the index
-		 */
-		public function setOperatorAt(i:uint, ic:IControl):IControl
-		{
-			var old:IControl = _list[i];
-			_list[i] = ic;
-			old.detach();
-			ic.attach(_vis);
-			return old;
-		}
-		
-		/**
-		 * Adds a control to the end of this list.
-		 * @param ic the control to add
-		 */
-		public function add(ic:IControl):void
-		{
-			ic.attach(_vis);
-			_list.push(ic);
-		}
-		
-		/**
-		 * Removes an control from this list.
-		 * @param ic the control to remove
-		 * @return true if the control was found and removed, false otherwise
-		 */
-		public function remove(ic:IControl):IControl
-		{
-			var idx:int = Arrays.remove(_list, ic);
-			if (idx >= 0) ic.detach();
-			return ic;
-		}
-		
-		/**
-		 * Removes all controls from this list.
-		 */
-		public function clear():void
-		{
-			for each (var ic:IControl in _list) { ic.detach(); }
-			Arrays.clear(_list);
-		}
-		
-		// -- MXML ------------------------------------------------------------
-		
-		/** @private */
-		public function initialized(document:Object, id:String):void
-		{
-			// do nothing
-		}
-
-	} // end of class ControlList
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/controls/DragControl.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/controls/DragControl.as
deleted file mode 100644
index fc3773acf5..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/controls/DragControl.as
+++ /dev/null
@@ -1,101 +0,0 @@
-package flare.vis.controls
-{
-	import flare.vis.data.DataSprite;
-	
-	import flash.display.InteractiveObject;
-	import flash.display.Sprite;
-	import flash.events.Event;
-	import flash.events.MouseEvent;
-	
-	/**
-	 * Interactive control for dragging items. A DragControl will enable
-	 * dragging of all Sprites in a container object by clicking and dragging
-	 * them.
-	 */
-	public class DragControl extends Control
-	{
-		private var _cur:Sprite;
-		private var _mx:Number, _my:Number;
-		
-		/** Indicates if drag should be followed at frame rate only.
-		 *  If false, drag events can be processed faster than the frame
-		 *  rate, however, this may pre-empt other processing. */
-		public var trackAtFrameRate:Boolean = false;
-		
-		/** Filter function for limiting the items available for dragging. */
-		public var filter:Function;
-		
-		/** The active item currently being dragged. */
-		public function get activeItem():Sprite { return _cur; }
-		
-		/**
-		 * Creates a new DragControl.
-		 * @param container the container object containing the items to drag
-		 * @param filter a Boolean-valued filter function determining which
-		 *  items should be draggable.
-		 */		
-		public function DragControl(container:InteractiveObject=null,
-									filter:Function=null) {
-			if (container!=null) attach(container);
-			this.filter = filter;
-		}
-		
-		/** @inheritDoc */
-		public override function attach(obj:InteractiveObject):void
-		{
-			super.attach(obj);
-			obj.addEventListener(MouseEvent.MOUSE_DOWN, onMouseDown);
-		}
-		
-		/** @inheritDoc */
-		public override function detach() : InteractiveObject
-		{
-			if (_object != null) {
-				_object.removeEventListener(MouseEvent.MOUSE_DOWN, onMouseDown);
-			}
-			return super.detach();
-		}
-		
-		private function onMouseDown(event:MouseEvent) : void {
-			var s:Sprite = event.target as Sprite;
-			if (s==null) return; // exit if not a sprite
-			
-			if (filter==null || filter(s)) {
-				_cur = s;
-				_mx = _object.mouseX;
-				_my = _object.mouseY;
-				if (_cur is DataSprite) (_cur as DataSprite).fix();
-
-				_cur.stage.addEventListener(MouseEvent.MOUSE_MOVE, onDrag);
-				_cur.stage.addEventListener(MouseEvent.MOUSE_UP, onMouseUp);
-			}
-			event.stopPropagation();
-		}
-		
-		private function onDrag(event:Event) : void {
-			var x:Number = _object.mouseX;
-			if (x != _mx) {
-				_cur.x += (x - _mx);
-				_mx = x;
-			}
-			
-			var y:Number = _object.mouseY;
-			if (y != _my) {
-				_cur.y += (y - _my);
-				_my = y;
-			}
-		}
-		
-		private function onMouseUp(event:MouseEvent) : void {
-			if (_cur != null) {
-				_cur.stage.removeEventListener(MouseEvent.MOUSE_UP, onMouseUp);
-				_cur.stage.removeEventListener(MouseEvent.MOUSE_MOVE, onDrag);
-				
-				if (_cur is DataSprite) (_cur as DataSprite).unfix();
-				event.stopPropagation();
-			}
-			_cur = null;
-		}
-		
-	} // end of class DragControl
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/controls/ExpandControl.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/controls/ExpandControl.as
deleted file mode 100644
index 45b20c283f..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/controls/ExpandControl.as
+++ /dev/null
@@ -1,96 +0,0 @@
-package flare.vis.controls
-{
-	import flare.vis.Visualization;
-	import flare.vis.data.NodeSprite;
-	
-	import flash.display.InteractiveObject;
-	import flash.events.MouseEvent;
-
-	/**
-	 * Interactive control for expaning and collapsing graph or tree nodes
-	 * by clicking them. This control will only work when applied to a
-	 * Visualization instance.
-	 */
-	public class ExpandControl extends Control
-	{
-		private var _cur:NodeSprite;
-
-		/** Boolean-valued filter function for determining which items
-		 *  this control will attempt to expand or collapse. */
-		public var filter:Function;
-		
-		/** Update function invoked after expanding or collapsing an item.
-		 *  By default, invokes the <code>update</code> method on the
-		 *  visualization with a 1-second transitioner. */
-		public var update:Function = function():void {
-			Visualization(_object).update(1).play();
-		}
-		
-		// --------------------------------------------------------------------
-		
-		/**
-		 * Creates a new ExpandControl.
-		 * @param vis the visualization to interact with
-		 * @param filter a Boolean-valued filter function for determining which
-		 *  item this control will expand or collapse
-		 * @param update function invokde after expanding or collapsing an
-		 *  item.
-		 */		
-		public function ExpandControl(vis:Visualization=null, filter:Function=null, 
-									  update:Function=null)
-		{
-			attach(vis);
-			this.filter = filter;
-			if (update != null) this.update = update;
-		}
-		
-		/** @inheritDoc */
-		public override function attach(obj:InteractiveObject):void
-		{
-			if (obj==null) { detach(); return; }
-			if (!(obj is Visualization)) {
-				throw new Error("This control can only be attached to a Visualization");
-			}
-			super.attach(obj);
-			obj.addEventListener(MouseEvent.MOUSE_DOWN, onMouseDown);
-		}
-		
-		/** @inheritDoc */
-		public override function detach():InteractiveObject
-		{
-			if (_object != null) {
-				_object.removeEventListener(MouseEvent.MOUSE_DOWN, onMouseDown);
-			}
-			return super.detach();
-		}
-		
-		private function onMouseDown(event:MouseEvent) : void {
-			var s:NodeSprite = event.target as NodeSprite;
-			if (s==null) return; // exit if not a NodeSprite
-			
-			if (filter==null || filter(s)) {
-				_cur = s;
-				_cur.stage.addEventListener(MouseEvent.MOUSE_MOVE, onDrag);
-				_cur.stage.addEventListener(MouseEvent.MOUSE_UP, onMouseUp);
-			}
-			event.stopPropagation();
-		}
-		
-		private function onDrag(event:MouseEvent) : void {
-			_cur.stage.removeEventListener(MouseEvent.MOUSE_UP, onMouseUp);
-			_cur.stage.removeEventListener(MouseEvent.MOUSE_MOVE, onDrag);
-			_cur = null;
-		}
-		
-		private function onMouseUp(event:MouseEvent) : void {
-			_cur.stage.removeEventListener(MouseEvent.MOUSE_UP, onMouseUp);
-			_cur.stage.removeEventListener(MouseEvent.MOUSE_MOVE, onDrag);
-			_cur.expanded = !_cur.expanded;
-			_cur = null;	
-			event.stopPropagation();
-			
-			update();
-		}
-		
-	} // end of class ExpandControl
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/controls/HoverControl.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/controls/HoverControl.as
deleted file mode 100644
index c989673e3a..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/controls/HoverControl.as
+++ /dev/null
@@ -1,100 +0,0 @@
-package flare.vis.controls
-{
-	import flash.display.DisplayObject;
-	import flash.display.DisplayObjectContainer;
-	import flash.display.InteractiveObject;
-	import flash.events.MouseEvent;
-
-	/**
-	 * Interactive control for responding to mouse hover events. The
-	 * <code>onRollOver</code> and <code>onRollOut</code> function properties
-	 * should be set with custom functions for performing actions when the
-	 * mouse cursor hovers over a display object.
-	 */
-	public class HoverControl extends Control
-	{
-		/** Constant indicating that objects hovered over should not be moved
-		 *  within their parent container changed. */
-		public static const DONT_MOVE:int = 0;
-		/** Constant indicating that objects hovered over should be moved to
-		 *  the front of their parent container and kept there. */
-		public static const MOVE_TO_FRONT:int = 1;
-		/** Constant indicating that objects hovered over should be moved to
-		 *  the front of their parent container and then returned to their
-		 *  previous position when the mouse rolls out. */
-		public static const MOVE_AND_RETURN:int = 2;
-		
-		private var _cur:DisplayObject;
-		private var _idx:int;
-		private var _filter:Function;
-		private var _movePolicy:int;
-		
-		/** Function invoked when the mouse enters an item. */
-		public var onRollOver:Function;
-		/** Function invoked when the mouse leaves an item. */
-		public var onRollOut:Function;
-				
-		/**
-		 * Creates a new HoverControl.
-		 * @param container the container object to monitor
-		 * @param filter a Boolean-valued filter function indicating which
-		 *  items should trigger hover processing
-		 * @param movePolicy indicates which policy should be used for changing
-		 *  the z-ordering of hovered items. One of DONT_MOVE (the default),
-		 *  MOVE_TO_FRONT, or MOVE_AND_RETURN.
-		 */
-		public function HoverControl(container:InteractiveObject=null,
-			filter:Function=null, movePolicy:int=DONT_MOVE)
-		{
-			attach(container);
-			_filter = filter;
-			_movePolicy = movePolicy;
-		}
-		
-		/** @inheritDoc */
-		public override function attach(obj:InteractiveObject):void
-		{
-			super.attach(obj);
-			if (obj != null) {
-				obj.addEventListener(MouseEvent.MOUSE_OVER, onMouseOver);
-				obj.addEventListener(MouseEvent.MOUSE_OUT, onMouseOut);
-			}
-		}
-		
-		/** @inheritDoc */
-		public override function detach():InteractiveObject
-		{
-			if (_object != null) {
-				_object.removeEventListener(MouseEvent.MOUSE_OVER, onMouseOver);
-				_object.removeEventListener(MouseEvent.MOUSE_OUT, onMouseOut);
-			}
-			return super.detach();
-		}
-		
-		private function onMouseOver(evt:MouseEvent):void
-		{
-			var n:DisplayObject = evt.target as DisplayObject;
-			if (n==null || (_filter!=null && !_filter(n))) return;
-			
-			_cur = n;
-			
-			if (_movePolicy != DONT_MOVE && n.parent != null) {
-				var p:DisplayObjectContainer = n.parent;
-				_idx = p.getChildIndex(n);
-				p.setChildIndex(n, p.numChildren-1);
-			}
-			if (onRollOver != null) { onRollOver(_cur); }
-		}
-		
-		private function onMouseOut(evt:MouseEvent):void
-		{
-			if (_cur == null) return;
-			if (onRollOut != null) { onRollOut(_cur); }
-			if (_movePolicy == MOVE_AND_RETURN) {
-				_cur.parent.setChildIndex(_cur, _idx);
-			}
-			_cur = null;
-		}
-		
-	} // end of class HoverControl
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/controls/IControl.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/controls/IControl.as
deleted file mode 100644
index 228f325150..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/controls/IControl.as
+++ /dev/null
@@ -1,27 +0,0 @@
-package flare.vis.controls
-{
-	import flash.display.InteractiveObject;
-	
-	import mx.core.IMXMLObject;
-	
-	public interface IControl extends IMXMLObject
-	{
-		/** The interactive object this control is attached to. */
-		function get object():InteractiveObject;
-		
-		/**
-		 * Attach this control to the given interactive object. This method
-		 * will automatically detach if already attached to another object.
-		 * @param obj the display object to attach to
-		 */
-		function attach(obj:InteractiveObject):void;
-		
-		/**
-		 * Detach this control.
-		 * @return the interactive object this control was attached to,
-		 *  or null if this control was not attached.
-		 */
-		function detach():InteractiveObject;
-		
-	} // end of interface IControl
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/controls/PanZoomControl.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/controls/PanZoomControl.as
deleted file mode 100644
index 687c5a01cc..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/controls/PanZoomControl.as
+++ /dev/null
@@ -1,157 +0,0 @@
-package flare.vis.controls
-{
-	import flare.vis.util.graphics.Transforms;
-	
-	import flash.display.InteractiveObject;
-	import flash.display.Stage;
-	import flash.events.Event;
-	import flash.events.MouseEvent;
-	
-	/**
-	 * Interactive control for panning and zooming a "camera". Any sprite can
-	 * be treated as a camera onto its drawing content and display list
-	 * children. The PanZoomControl allows you to manipulate a sprite's
-	 * transformation matrix (the <code>transform.matrix</code> property) to
-	 * simulate camera movements such as panning and zooming. To pan and
-	 * zoom over a collection of objects, simply add a PanZoomControl for
-	 * the sprite holding the collection.
-	 * 
-	 * <pre>
-	 * var s:Sprite; // a sprite holding a collection of items
-	 * new PanZoomControl(s); // attach pan and zoom controls to the sprite
-	 * </pre>
-	 * <p>Once a PanZoomControl has been created, panning is performed by
-	 * clicking and dragging. Zooming is performed either by scrolling the
-	 * mouse wheel or by clicking and dragging vertically while the control key
-	 * is pressed.</p>
-	 * 
-	 * <p>By default, the PanZoomControl attaches itself to the
-	 * <code>stage</code> to listen for mouse events. This works fine if there
-	 * is only one collection of objects in the display list, but can cause
-	 * trouble if you want to have multiple collections that can be separately
-	 * panned and zoomed. The PanZoomControl constructor takes a second
-	 * argument that specifies a "hit area", a shape in the display list that
-	 * should be used to listen to the mouse events for panning and zooming.
-	 * For example, this could be a background sprite behind the zoomable
-	 * content, to which the "camera" sprite could be added. One can then set
-	 * the <code>scrollRect</code> property to add clipping bounds to the 
-	 * panning and zooming region.</p>
-	 */
-	public class PanZoomControl extends Control
-	{
-		private var px:Number, py:Number;
-		private var dx:Number, dy:Number;
-		private var mx:Number, my:Number;
-		private var _drag:Boolean = false;
-		
-		private var _hit:InteractiveObject;
-		private var _stage:Stage;
-		
-		/** The active hit area over which pan/zoom interactions can be performed. */
-		public function get hitArea():InteractiveObject { return _hit; }
-		public function set hitArea(hitArea:InteractiveObject):void {
-			if (_hit != null) onRemove();
-			_hit = hitArea;
-			if (_object.stage != null) onAdd();
-		}
-		
-		/**
-		 * Creates a new PanZoomControl.
-		 * @param camera a display object to treat as the camera
-		 * @param hitArea a display object to use as the hit area for mouse
-		 *  events. For example, this could be a background region over which
-		 *  the panning and zooming should be done. If this argument is null,
-		 *  the stage will be used.
-		 */
-		public function PanZoomControl(camera:InteractiveObject=null,
-			hitArea:InteractiveObject=null):void
-		{
-			_hit = hitArea;
-			attach(camera);
-		}
-		
-		/** @inheritDoc */
-		public override function attach(obj:InteractiveObject):void
-		{
-			super.attach(obj);
-			if (obj != null) {
-				obj.addEventListener(Event.ADDED_TO_STAGE, onAdd);
-				obj.addEventListener(Event.REMOVED_FROM_STAGE, onRemove);
-				if (obj.stage != null) onAdd();
-			}
-		}
-		
-		/** @inheritDoc */
-		public override function detach():InteractiveObject
-		{
-			onRemove();
-			_object.removeEventListener(Event.ADDED_TO_STAGE, onAdd);
-			_object.removeEventListener(Event.REMOVED_FROM_STAGE, onRemove);
-			_hit = null;
-			return super.detach();
-		}
-		
-		private function onAdd(evt:Event=null):void
-		{
-			_stage = _object.stage;
-			if (_hit == null) _hit = _stage;
-			_hit.addEventListener(MouseEvent.MOUSE_DOWN, onMouseDown);
-			_hit.addEventListener(MouseEvent.MOUSE_WHEEL, onMouseWheel);
-		}
-		
-		private function onRemove(evt:Event=null):void
-		{
-			_hit.removeEventListener(MouseEvent.MOUSE_DOWN, onMouseDown);
-			_hit.removeEventListener(MouseEvent.MOUSE_WHEEL, onMouseWheel);
-		}
-		
-		private function onMouseDown(event:MouseEvent) : void
-		{
-			if (_stage == null) return;
-			_stage.addEventListener(MouseEvent.MOUSE_UP, onMouseUp);
-			_stage.addEventListener(MouseEvent.MOUSE_MOVE, onMouseMove);
-			
-			px = mx = event.stageX;
-			py = my = event.stageY;
-			_drag = true;
-		}
-			
-		private function onMouseMove(event:MouseEvent) : void
-		{
-			if (!_drag) return;
-			
-			var x:Number = event.stageX;
-			var y:Number = event.stageY;
-			
-			if (!event.ctrlKey) {
-				dx = dy = NaN;
-				Transforms.panBy(_object, x-mx, y-my);
-			} else {
-				if (isNaN(dx)) {
-					dx = event.stageX;
-					dy = event.stageY;
-				}
-				var dz:Number = 1 + (y-my)/100;
-				Transforms.zoomBy(_object, dz, dx, dy);
-			}
-			mx = x;
-			my = y;
-		}
-		
-		private function onMouseUp(event:MouseEvent) : void
-		{
-			dx = dy = NaN;
-			_drag = false;
-			_stage.removeEventListener(MouseEvent.MOUSE_UP, onMouseUp);
-			_stage.removeEventListener(MouseEvent.MOUSE_MOVE, onMouseMove);
-		}
-		
-		private function onMouseWheel(event:MouseEvent) : void
-		{
-			var dw:Number = 1.1 * event.delta;
-			var dz:Number = dw < 0 ? 1/Math.abs(dw) : dw;
-			Transforms.zoomBy(_object, dz);
-		}
-		
-	} // end of class PanZoomControl
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/controls/SelectionControl.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/controls/SelectionControl.as
deleted file mode 100644
index 926c421340..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/controls/SelectionControl.as
+++ /dev/null
@@ -1,171 +0,0 @@
-package flare.vis.controls
-{
-	import flash.display.DisplayObject;
-	import flash.display.DisplayObjectContainer;
-	import flash.display.Graphics;
-	import flash.display.InteractiveObject;
-	import flash.display.Shape;
-	import flash.display.Stage;
-	import flash.events.Event;
-	import flash.events.MouseEvent;
-	import flash.geom.Rectangle;
-
-	/**
-	 * Interactive control for selecting a group of objects by "rubber-banding"
-	 * them with a rectangular section region.
-	 */
-	public class SelectionControl extends Control
-	{
-		private var _r:Rectangle = new Rectangle();
-		private var _drag:Boolean = false;
-		private var _shape:Shape = new Shape();
-		private var _hit:InteractiveObject;
-		private var _stage:Stage;
-		
-		/** Boolean-valued filter function determining which items are eligible
-		 *  for selection. */
-		public var filter:Function = null;
-		
-		/** Function invoked when an item is added to the selection. */
-		public var onSelect:Function;
-		/** Function invokde when an item is removed from the selection. */
-		public var onDeselect:Function;
-		
-		/** The active hit area over which pan/zoom interactions can be performed. */
-		public function get hitArea():InteractiveObject { return _hit; }
-		public function set hitArea(hitArea:InteractiveObject):void {
-			if (_hit != null) onRemove();
-			_hit = hitArea;
-			if (_object.stage != null) onAdd();
-		}
-		
-		/**
-		 * Creates a new SelectionControl.
-		 * @param container the container object to monitor for selections
-		 * @param filter an optional Boolean-valued filter determining which
-		 *  items are eligible for selection.
-		 */
-		public function SelectionControl(container:InteractiveObject=null,
-					filter:Function = null, hitArea:InteractiveObject=null)
-		{
-			_hit = hitArea;
-			this.filter = filter;
-			attach(container);
-		}
-		
-		/** @inheritDoc */
-		public override function attach(obj:InteractiveObject):void
-		{
-			if (obj==null) { detach(); return; }
-			if (!(obj is DisplayObjectContainer)) {
-				throw new Error("Attached object must be a DisplayObjectContainer");
-			}
-			super.attach(obj);
-			if (obj != null) {
-				obj.addEventListener(Event.ADDED_TO_STAGE, onAdd);
-				obj.addEventListener(Event.REMOVED_FROM_STAGE, onRemove);
-				if (obj.stage != null) onAdd();
-			}
-		}
-		
-		/** @inheritDoc */
-		public override function detach():InteractiveObject
-		{
-			onRemove();
-			if (_object != null) {
-				_object.removeEventListener(Event.ADDED_TO_STAGE, onAdd);
-				_object.removeEventListener(Event.REMOVED_FROM_STAGE, onRemove);
-			}
-			_hit = null;
-			return super.detach();
-		}
-		
-		private function onAdd(evt:Event=null):void
-		{
-			_stage = _object.stage;
-			if (_hit == null) _hit = _stage;
-			_hit.addEventListener(MouseEvent.MOUSE_DOWN, mouseDown);
-			DisplayObjectContainer(_object).addChild(_shape);
-		}
-		
-		private function onRemove(evt:Event=null):void
-		{
-			if (_hit)
-				_hit.removeEventListener(MouseEvent.MOUSE_DOWN, mouseDown);
-			if (_object)
-				DisplayObjectContainer(_object).removeChild(_shape);
-		}
-		
-		private function mouseDown(evt:MouseEvent):void
-		{
-			if (_stage == null) return;
-			_stage.addEventListener(MouseEvent.MOUSE_UP, mouseUp);
-			_stage.addEventListener(MouseEvent.MOUSE_MOVE, mouseMove);
-			
-			_r.x = _object.mouseX;
-			_r.y = _object.mouseY;
-			_r.width = 0;
-			_r.height = 1;
-			_drag = true;
-			renderShape();
-			selectionTest();
-		}
-		
-		private function mouseMove(evt:MouseEvent):void
-		{
-			if (!_drag) return;
-			_r.width = _object.mouseX - _r.x;
-			_r.height = _object.mouseY - _r.y;
-			renderShape();
-			selectionTest();
-		}
-		
-		private function mouseUp(evt:MouseEvent):void
-		{
-			_drag = false;
-			_shape.graphics.clear();
-			_stage.removeEventListener(MouseEvent.MOUSE_UP, mouseUp);
-			_stage.removeEventListener(MouseEvent.MOUSE_MOVE, mouseMove);
-		}
-		
-		private function renderShape():void {
-			var g:Graphics = _shape.graphics;
-			g.clear();
-			
-			g.beginFill(0x8888FF, 0.2);
-			g.lineStyle(2, 0x8888FF, 0.4, true, "none");
-			g.drawRect(_r.x, _r.y, _r.width, _r.height);
-			g.endFill();
-		}
-		
-		private function selectionTest():void {
-			var con:DisplayObjectContainer = DisplayObjectContainer(_object);
-			for (var i:uint=0; i<con.numChildren; ++i) {
-				walkTree(con.getChildAt(i), selTest);
-			}
-		}
-		
-		private static function walkTree(obj:DisplayObject, func:Function):void
-		{
-			func(obj);
-			if (obj is DisplayObjectContainer) {
-				var con:DisplayObjectContainer = obj as DisplayObjectContainer;
-				for (var i:int=0; i<con.numChildren; ++i) {
-					walkTree(con.getChildAt(i), func);
-				}
-			}
-		}
-		
-		private function selTest(d:DisplayObject):void
-		{
-			if (filter!=null && !filter(d)) return;
-			
-			if (d.hitTestObject(_shape)) {
-				if (onSelect != null) onSelect(d);
-			} else {
-				if (onDeselect != null) onDeselect(d);
-			}
-		}
-		
-	} // end of class SelectionControl
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/data/Data.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/data/Data.as
deleted file mode 100644
index 920294e3db..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/data/Data.as
+++ /dev/null
@@ -1,574 +0,0 @@
-package flare.vis.data
-{
-	import flare.data.DataField;
-	import flare.data.DataSchema;
-	import flare.data.DataSet;
-	import flare.util.Arrays;
-	import flare.util.Property;
-	import flare.util.Sort;
-	import flare.util.Stats;
-	import flare.vis.events.DataEvent;
-	import flare.vis.scale.Scale;
-	import flare.vis.scale.ScaleType;
-	import flare.vis.scale.Scales;
-	import flare.vis.util.TreeUtil;
-	
-	import flash.events.EventDispatcher;
-	
-	/**
-	 * Data structure for managing a collection of visual data objects. The
-	 * Data class manages both unstructured data and data organized in a
-	 * general graph (or network structure), maintaining collections of both
-	 * nodes and edges. Default property values can be defined that are set
-	 * on all new nodes or edges added to the data collection. Furthermore,
-	 * the Data class supports sorting of node and edges, generation and
-	 * caching of data value statistics, creation of data scales for
-	 * data properties, and spanning tree calculation.
-	 * 
-	 * <p>While Data objects maintain a collection of visual DataSprites,
-	 * they are not themselves visual object containers. Instead a Data
-	 * instance is used as input to a <code>Visualization</code> that
-	 * is responsible for processing the DataSprite instances and adding
-	 * them to the Flash display list.</p>
-	 */
-	public class Data extends EventDispatcher
-	{
-		/** Flag indicating the nodes in a Data object. */
-		public static const NODES:int = 1;
-		/** Flag indicating the edges in a Data object. */
-		public static const EDGES:int = 2;
-		/** Flag indicating all items (nodes and edges) in a Data object. */
-		public static const ALL:int = 3;
-		/** Flag indicating a reverse traversal should be performed. */
-		public static const REVERSE:int = 4;
-		
-		/** Internal list of NodeSprites. */
-		protected var _nodes:DataList = new DataList();
-		/** Internal list of EdgeSprites. */
-		protected var _edges:DataList = new DataList();
-		
-		/** The total number of items (nodes and edges) in the data. */
-		public function get size():int { return _nodes.size + _edges.size; }
-		
-		/** The collection of NodeSprites. */
-		public function get nodes():DataList { return _nodes; }
-		/** The collection of EdgeSprites. */
-		public function get edges():DataList { return _edges; }
-		
-		/** The default directedness of new edges. */
-		public var directedEdges:Boolean;
-		
-		
-		// -- Methods ---------------------------------------------------------
-
-		/**
-		 * Creates a new Data instance.
-		 * @param directedEdges the default directedness of new edges
-		 */
-		public function Data(directedEdges:Boolean=false) {
-			this.directedEdges = directedEdges;
-		}
-		
-		/**
-		 * Creates a new Data instance from an array of tuples. The object in
-		 * the array will become the data objects for NodeSprites.
-		 * @param a an Array of data objects
-		 * @return a new Data instance, with NodeSprites populated with the
-		 *  input data.
-		 */
-		public static function fromArray(a:Array):Data {
-			var d:Data = new Data();
-			for each (var tuple:Object in a) {
-				d.addNode(tuple);
-			}
-			return d;
-		}
-		
-		/**
-		 * Creates a new Data instance from a data set.
-		 * @param ds a DataSet to visualize. For example, this data set may be
-		 *  loaded using a data converter in the flare.data library.
-		 * @return a new Data instance, with NodeSprites and EdgeSprites
-		 *  populated with the input data.
-		 */
-		public static function fromDataSet(ds:DataSet):Data {			
-			var d:Data = new Data(), i:int;
-			var schema:DataSchema, f:DataField;
-			
-			// copy node data defaults
-			if ((schema = ds.nodes.schema)) {
-				for (i=0; i<schema.numFields; ++i) {
-					f = schema.getFieldAt(i);
-					if (f.defaultValue)
-						d.nodes.setDefault("data."+f.name, f.defaultValue);
-				}
-			}
-			// add node data
-			for each (var tuple:Object in ds.nodes.data) {
-				d.addNode(tuple);
-			}
-			// exit if there is no edge data
-			if (!ds.edges) return d;
-				
-			var nodes:DataList = d.nodes, map:Object = {};
-			var id:String = "id"; // TODO: generalize these fields
-			var src:String = "source";
-			var trg:String = "target";
-			var dir:String = "directed";
-			
-			// build node map
-			for (i=0; i<nodes.size; ++i) {
-				map[nodes[i].data[id]] = nodes[i];
-			}
-			
-			// copy edge data defaults
-			if ((schema = ds.edges.schema)) {
-				for (i=0; i<schema.numFields; ++i) {
-					f = schema.getFieldAt(i);
-					if (f.defaultValue)
-						d.edges.setDefault("data."+f.name, f.defaultValue);
-				}
-				if ((f = schema.getFieldByName(dir))) {
-					d.directedEdges = Boolean(f.defaultValue);
-				}
-			}
-			// add edge data
-			for each (tuple in ds.edges.data) {
-				var n1:NodeSprite = map[tuple[src]];
-				if (!n1) throw new Error("Missing node id="+tuple[src]);
-				var n2:NodeSprite = map[tuple[trg]];
-				if (!n2) throw new Error("Missing node id="+tuple[trg]);
-				d.addEdgeFor(n1, n2, tuple[dir], tuple);
-			}
-			
-			return d;
-		}
-
-		// -- Operations ---------------------------------------
-		
-		/**
-		 * Sort DataSprites according to their properties.
-		 * @param a the sort arguments.
-		 * 	If a String is provided, the data will be sorted in ascending order
-		 *   according to the data field named by the string.
-		 *  If an Array is provided, the data will be sorted according to the
-		 *   fields in the array. In addition, field names can optionally
-		 *   be followed by a boolean value. If true, the data is sorted in
-		 *   ascending order (the default). If false, the data is sorted in
-		 *   descending order.
-		 * @param which the data group(s) to sort (e.g., NODES or EDGES).
-		 *  The default is NODES.
-		 */
-		public function sort(a:*, which:int=NODES):void
-		{
-			var args:Array;
-			if (a is String) args = [a];
-			else if (a is Array)  args = a;
-			else throw new ArgumentError("Illegal input: "+a);
-			
-			var f:Function = Sort.sorter(args);
-			if (which & NODES) _nodes.list.sort(f);
-			if (which & EDGES) _edges.list.sort(f);
-		}
-		
-		
-		// -- Containment --------------------------------------
-		
-		/**
-		 * Indicates if this Data object contains the input DataSprite.
-		 * @param d the DataSprite to check for containment
-		 * @return true if the sprite is in this data collection, false
-		 *  otherwise.
-		 */
-		public function contains(d:DataSprite):Boolean
-		{
-			return (_nodes.contains(d) || _edges.contains(d));
-		}
-		
-		// -- Add ----------------------------------------------
-		
-		/**
-		 * Adds a node to this data collection.
-		 * @param d either a data tuple or NodeSprite object. If the input is
-		 *  a non-null data tuple, this will become the new node's
-		 *  <code>data</code> property. If the input is a NodeSprite, it will
-		 *  be directly added to the collection.
-		 * @return the newly added NodeSprite
-		 */
-		public function addNode(d:Object=null):NodeSprite
-		{
-			var ns:NodeSprite = NodeSprite(d is NodeSprite ? d : newNode(d));
-			_nodes.add(ns);
-			fireEvent(DataEvent.DATA_ADDED, ns);
-			return ns;
-		}
-		
-		/**
-		 * Add an edge to this data set. The input must be of type EdgeSprite,
-		 * and must have both source and target nodes that are already in
-		 * this data set. If any of these conditions are not met, this method
-		 * will return null. Note that no exception will be thrown on failures.
-		 * @param e the EdgeSprite to add
-		 * @return the newly added EdgeSprite
-		 */
-		public function addEdge(e:EdgeSprite):EdgeSprite
-		{
-			if (_nodes.contains(e.source) && _nodes.contains(e.target)) {
-				_edges.add(e);
-				fireEvent(DataEvent.DATA_ADDED, e);
-				return e;
-			} else {
-				return null;
-			}
-		}
-		
-		/**
-		 * Generates edges for this data collection that connect the nodes
-		 * according to the input properties. The nodes are sorted by the
-		 * sort argument and grouped by the group-by argument. All nodes
-		 * with the same group are sequentially connected to each other in
-		 * sorted order by new edges. This method is useful for generating
-		 * line charts from a plot of nodes.
-		 * @param sortBy the criteria for sorting the nodes, using the format
-		 *  of <code>flare.util.Sort</code>. The input can either be a string
-		 *  with a single property name, or an array of property names, with
-		 *  optional boolean sort order parameters (true for ascending, false
-		 *  for descending) following each name.
-		 * @param groupBy the criteria for grouping the nodes, using the format
-		 *  of <code>flare.util.Sort</code>. The input can either be a string
-		 *  with a single property name, or an array of property names, with
-		 *  optional boolean sort order parameters (true for ascending, false
-		 *  for descending) following each name.
-		 */
-		public function createEdges(sortBy:*=null, groupBy:*=null):void
-		{
-			// create arrays and sort criteria
-			var a:Array = Arrays.copy(_nodes.list);
-			var g:Array = groupBy ? 
-				(groupBy is Array ? groupBy as Array : [groupBy]) : [];
-			var len:int = g.length;
-			if (sortBy is Array) {
-				var s:Array = sortBy as Array;
-				for (var i:uint=0; i<s.length; ++i)
-					g.push(s[i]);
-			} else {
-				g.push(sortBy);
-			}
-			
-			// sort to group by, then ordering
-			a.sort(Sort.sorter(g));
-			
-			// get property instances for value operations
-			var p:Array = new Array();
-			for (i=0; i<len; ++i) {
-				if (g[i] is String)
-					p.push(Property.$(g[i]));
-			}
-			var f:Property = p[p.length-1];
-			
-			// connect all items who match on the last group by field
-			for (i=1; i<a.length; ++i) {
-				if (!f || f.getValue(a[i-1]) == f.getValue(a[i])) {
-					var e:EdgeSprite = addEdgeFor(a[i-1], a[i], directedEdges);
-					// add data values from nodes
-					for (var j:uint=0; j<p.length; ++j) {
-						p[j].setValue(e, p[j].getValue(a[i]));
-					}
-				}
-			}
-		}
-		
-		/**
-		 * Creates a new edge between the given nodes and adds it to the
-		 * data collection.
-		 * @param source the source node (must already be in this data set)
-		 * @param target the target node (must already be in this data set)
-		 * @param directed indicates the directedness of the edge (null to
-		 *  use this Data's default, true for directed, false for undirected)
-		 * @param data a data tuple containing data values for the edge
-		 *  instance. If non-null, this will become the EdgeSprite's
-		 *  <code>data</code> property.
-		 * @return the newly added EdgeSprite
- 		 */
-		public function addEdgeFor(source:NodeSprite, target:NodeSprite,
-			directed:Object=null, data:Object=null):EdgeSprite
-		{
-			if (!_nodes.contains(source) || !_nodes.contains(target)) {
-				return null;
-			}
-			var d:Boolean = directed==null ? directedEdges : Boolean(directed);
-			var e:EdgeSprite = newEdge(source, target, d, data);
-			if (data != null) e.data = data;
-			source.addOutEdge(e);
-			target.addInEdge(e);
-			return addEdge(e);
-		}
-		
-		/**
-		 * Internal function for creating a new node. Creates a NodeSprite,
-		 * sets its data property, and applies default values.
-		 * @param data the new node's data property
-		 * @return the newly created node
-		 */
-		protected function newNode(data:Object):NodeSprite
-		{
-			var ns:NodeSprite = new NodeSprite();
-			_nodes.applyDefaults(ns);
-			if (data != null) { ns.data = data; }
-			return ns;
-		}
-		
-		/**
-		 * Internal function for creating a new edge. Creates an EdgeSprite,
-		 * sets its data property, and applies default values.
-		 * @param s the source node
-		 * @param t the target node
-		 * @param d the edge's directedness
-		 * @param data the new edge's data property
-		 * @return the newly created node
-		 */		
-		protected function newEdge(s:NodeSprite, t:NodeSprite,
-								   d:Boolean, data:Object):EdgeSprite
-		{
-			var es:EdgeSprite = new EdgeSprite(s,t,d);
-			_edges.applyDefaults(es);
-			if (data != null) { es.data = data; }
-			return es;
-		}
-		
-		// -- Remove -------------------------------------------
-		
-		/**
-		 * Clears this data set, removing all nodes and edges.
-		 */
-		public function clear():void
-		{
-			// first, remove all the edges
-			clearEdges();
-			
-			// now remove all the nodes
-			var na:Array = _nodes.list;
-			_nodes.clear();
-			for (var i:int=0; i<na.length; ++i) {
-				fireEvent(DataEvent.DATA_REMOVED, na[i]);
-			}
-		}
-		
-		/**
-		 * Removes all edges from this data set; updates all incident nodes.
-		 */
-		public function clearEdges():void
-		{
-			var ea:Array = _edges.list, i:uint;
-			_edges.clear();
-			
-			for (i=0; i<ea.length; ++i) {
-				fireEvent(DataEvent.DATA_REMOVED, ea[i]);
-				ea[i].clear();
-			}
-			var nodes:Array = _nodes.list
-			for (i=0; i<_nodes.size; ++i) {
-				_nodes.list[i].removeAllEdges();
-			}
-		}
-		
-		/**
-		 * Internal method for removing an item from the data set. Removes the
-		 * item in an iteration-safe fashion and fires a removal event.
-		 * @param o the object to remove
-		 * @param list the list to remove the object from
-		 * @return true if removed successfully, false if the item is not found
-		 */
-		protected function removeInternal(o:DataSprite, list:DataList):Boolean
-		{
-			if (!list.contains(o)) return false;
-			// remove edge, fire event, and return
-			list.remove(o);
-			fireEvent(DataEvent.DATA_REMOVED, o);
-			return true;
-		}
-		
-		/**
-		 * Removes a DataSprite (node or edge) from this data collection.
-		 * @param d the DataSprite to remove
-		 * @return true if removed successfully, false if not found
-		 */
-		public function remove(d:DataSprite):Boolean
-		{
-			if (d is NodeSprite) return removeNode(d as NodeSprite);
-			if (d is EdgeSprite) return removeEdge(d as EdgeSprite);
-			return false;
-		}
-				
-		/**
-		 * Removes a node from this data set. All edges incident on this
-		 * node will also be removed. If the node is not found in this
-		 * data set, the method returns null.
-		 * @param n the node to remove
-		 * @returns true if sucessfully removed, false if not found in the data
-		 */
-		public function removeNode(n:NodeSprite):Boolean
-		{
-			if (!_nodes.contains(n)) return false;
-			
-			var base:Data = this;
-			n.visitEdges(function(e:EdgeSprite):void {
-				removeEdge(e);
-			}, NodeSprite.GRAPH_LINKS | NodeSprite.REVERSE);
-			
-			// finally, remove this node from the data set
-			return removeInternal(n, _nodes);
-		}
-		
-		/**
-		 * Removes an edge from this data set. The nodes connected to
-		 * this edge will have the edge removed from their edge lists.
-		 * @param e the edge to remove
-		 * @returns true if sucessfully removed, false if not found in the data
-		 */
-		public function removeEdge(e:EdgeSprite):Boolean
-		{
-			if (!_edges.contains(e)) return false;
-			e.source.removeOutEdge(e);
-			e.target.removeInEdge(e);
-			return removeInternal(e, _edges);
-		}
-				
-		// -- Events -------------------------------------------
-		
-		/**
-		 * Internal method for firing a data event.
-		 * @param type the event type
-		 * @param d the DataSprite for which the event is being fired
-		 * @param clearCache flag indicating if the statistics cache
-		 *  should be cleared in response to the update
-		 */
-		protected function fireEvent(type:String, d:DataSprite):void
-		{			
-			// reset the spanning tree on adds and removals
-			if (type != DataEvent.DATA_UPDATED)
-				_tree = null;
-			
-			// fire event, if anyone is listening
-			if (hasEventListener(type)) {
-				dispatchEvent(new DataEvent(type, this, d));
-			}
-		}
-		
-		// -- Visitors -----------------------------------------
-		
-		/**
-		 * Visit items, invoking a function on all visited elements.
-		 * @param v the function to invoke on each element. If the function
-		 *  return true, the visitation is ended with an early exit
-		 * @param opt visit options flag, indicating the data group(s) to visit
-		 *  (e.g., NODES or EDGES) and if the visitation traversal should be
-		 *  done in reverse (the REVERSE flag). The default is a forwards
-		 *  traversal over both nodes and edges.
-		 * @param filter an optional predicate function indicating which
-		 *  elements should be visited. Only items for which this function
-		 *  returns true will be visited.
-		 * @return true if the visitation was interrupted with an early exit
-		 */
-		public function visit(v:Function, opt:int=ALL, filter:Function=null):Boolean
-		{
-			var rev:Boolean = (opt & REVERSE) > 0;
-			if (opt & EDGES && _edges.size > 0 && _edges.visit(v, rev, filter))
-				return true;
-			if (opt & NODES && _nodes.size > 0 && _nodes.visit(v, rev, filter))
-				return true;
-			return false;
-		}
-		
-		
-		// -- Spanning Tree ---------------------------------------------------
-		
-		/** Tree builder function for generating a spanning tree.
-		 *  @see flare.vis.util.TreeUtil */
-		protected var _treeBuilder:Function = TreeUtil.breadthFirstTree;
-		/** The root node of the spanning tree. */
-		protected var _root:NodeSprite = null;
-		/** The generated spanning tree for this data set's graph. */
-		protected var _tree:Tree = null; // cached spanning tree
-		
-		/** Tree builder function for generating a spanning tree.
-		 *  @see flare.vis.util.TreeUtil */
-		public function get treeBuilder():Function { return _treeBuilder; }
-		public function set treeBuilder(f:Function):void {
-			if (_treeBuilder != f) {
-				_tree = null;
-				_treeBuilder = f;
-			}
-		}
-		
-		/** The root node of the spanning tree. */
-		public function get root():NodeSprite { return _root; }
-		public function set root(n:NodeSprite):void {
-			if (n != null && !_nodes.contains(n))
-				throw new ArgumentError("Spanning tree root must be within the graph.");
-			if (_root != n) {
-				_tree = null;
-				_root = n;
-			}
-		}
-		
-		/**
-		 * A spanning tree for this graph. The spanning tree generated is
-		 * determined by the <code>root</code> and <code>treeBuilder</code>
-		 * properties. By default, the tree is built using a breadth first
-		 * spanning tree using the first node in the graph as the root.
-		 */
-		public function get tree():Tree
-		{
-			if (_tree == null) {
-				// clear out any existing tree edges
-				for (var i:uint=0; i<_nodes.size; ++i) {
-					_nodes.list[i].removeEdges(NodeSprite.TREE_LINKS);
-				}
-				// build tree if necessary
-				var root:NodeSprite = _root == null ? _nodes[0] : _root;
-				_tree = _treeBuilder(root, this);	
-			}
-			return _tree;	
-		}
-		
-		/**
-		 * Sets the spanning tree used by this graph.
-		 * This tree must include only nodes and edges also in this graph.
-		 */
-		public function set tree(t:Tree):void
-		{
-			if (t==null) { _tree = null; return; }
-			
-			var ok:Boolean;
-			ok = !t.root.visitTreeDepthFirst(function(n:NodeSprite):Boolean {
-				if (n.parentEdge != null) {
-					if (!_edges.contains(n.parentEdge)) return true;
-				}
-				return !_nodes.contains(n);
-			});
-			if (ok) _tree = t;
-		}
-		
-		// -- Scale Factory ---------------------------------------------------
-		
-		/**
-		 * Create a new Scale instance for the given data field.
-		 * @param field the data property name to compute the scale for
-		 * @param which the data group (either NODES or EDGES) in which to look
-		 * @param scaleType the type of scale instance to generate
-		 * @return a Scale instance for the given data field
-		 * @see flare.vis.scale.Scales
-		 */
-		public function scale(field:String, which:int=NODES, 
-							  scaleType:String=ScaleType.LINEAR, ...rest):Scale
-		{
-			var list:DataList = (which==NODES ? _nodes : _edges);
-			var stats:Stats = list.stats(field);
-			var scale:Scale = Scales.scale(stats, scaleType);
-			// TODO: lookup formatting info (?)
-			return scale;
-		}
-
-	} // end of class Data
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/data/DataList.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/data/DataList.as
deleted file mode 100644
index 1ae199d996..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/data/DataList.as
+++ /dev/null
@@ -1,399 +0,0 @@
-package flare.vis.data
-{
-	import flare.animate.Transitioner;
-	import flare.util.Arrays;
-	import flare.util.Property;
-	import flare.util.Sort;
-	import flare.util.Stats;
-	import flare.vis.scale.Scale;
-	import flare.vis.scale.ScaleType;
-	import flare.vis.scale.Scales;
-	
-	import flash.utils.flash_proxy;
-	import flash.utils.Dictionary;
-	import flash.utils.Proxy;
-
-	/**
-	 * A list of nodes or edges maintained by a Data instance. Items contained
-	 * in this list can be accessed using array notation (<code>[]</code>),
-	 * iterated over using the <code>for each</code> construct, or can be
-	 * processed by passing a visitor function to the <code>visit</code>
-	 * method.
-	 */
-	public class DataList extends Proxy
-	{
-		/** Hashed set of items in the data list. */
-		private var _map:Dictionary = new Dictionary();
-		/** Array of items in the data set. */
-		private var _list:Array = [];
-		/** Default property values to be applied to new items. */
-		private var _defs:Object = null;
-		/** Cache of Stats objects for item properties. */
-		private var _stats:Object = {};
-		/** The underlying array storing the list. */
-		internal function get list():Array { return _list; }
-		
-		/** Internal count of visitors traversing the current list.*/
-		private var _visiting:int = 0;
-		private var _sort:Sort;
-		
-		/** The number of items contained in this list. */
-		public function get size():int { return _list.length; }
-		
-		/** A standing sort criteria for items in the list. */
-		public function get sort():Sort { return _sort; }
-		public function set sort(s:*):void {
-			_sort = s==null ? s : (s is Sort ? Sort(s) : new Sort(s));
-			if (_sort != null) _sort.sort(_list);
-		}
-		
-		
-		// -- Basic Operations: Contains, Add, Remove, Clear ------------------
-		
-		/**
-		 * Indicates if the given object is contained in this list.
-		 * @param o the object to check for containment
-		 * @return true if the list contains the object, false otherwise.
-		 */
-		public function contains(o:Object):Boolean
-		{
-			return (_map[o] != undefined);
-		}
-		
-		/**
-		 * Internal method for adding an object to the list. This method should
-		 * be used by the Data class only.
-		 * @param o the object to add
-		 * @return the added object
-		 * @private
-		 */
-		internal function add(o:Object):Object
-		{
-			_map[o] = _list.length;
-			_stats = {};
-			if (_sort != null) {
-				var idx:int = Arrays.binarySearch(_list, o, null,
-				                                  _sort.comparator);
-				_list.splice(-(idx+1), 0, o);
-			} else {
-				_list.push(o);
-			}
-			return o;
-		}
-		
-		/**
-		 * Internal method for removing an object from the list. This method
-		 * should be used by the Data class only.
-		 * @param o the object to remove
-		 * @return true if the object was found and removed, false otherwise
-		 * @private
-		 */
-		internal function remove(o:Object):Boolean
-		{
-			if (_map[o] == undefined) return false;
-			if (_visiting > 0) {
-				// if called from a visitor, use a copy-on-write strategy
-				_list = Arrays.copy(_list);
-				_visiting = 0; // reset the visitor count
-			}
-			Arrays.remove(_list, o);
-			delete _map[o];
-			_stats = {};	
-			return true;
-		}
-		
-		/**
-		 * Internal method for removing an object from the list. This method
-		 * should be used by the Data class only.
-		 * @param idx the index of the object to remove
-		 * @return the removed object
-		 * @private
-		 */
-		internal function removeAt(idx:int):Object
-		{
-			var o:Object = Arrays.removeAt(_list, idx);
-			if (o != null) {
-				delete _map[o];
-				_stats = {};
-			}
-			return o;
-		}
-		
-		/**
-		 * Internal method for removing all objects from ths list.
-		 * @private
-		 */
-		internal function clear():void
-		{
-			_map = new Dictionary();
-			_list = [];
-			_stats = {};
-		}
-		
-		/**
-		 * Returns an array of data objects for each item in this data list.
-		 * Data objects are retrieved from the "data" property for each item.
-		 * @return an array of data objects for items in this data list
-		 */
-		public function toDataArray():Array
-		{
-			var a:Array = new Array(_list.length);
-			for (var i:int=0; i<a.length; ++i) {
-				a[i] = _list[i].data;
-			}
-			return a;
-		}
-
-		// -- Sort ------------------------------------------------------------
-		
-		/**
-		 * Sort DataSprites according to their properties. This method performs
-		 * a one-time sorting. To establish a consistent sort order robust over
-		 * the addition of new items, use the <code>sort</code> property.
-		 * @param a the sort arguments.
-		 * 	If a String is provided, the data will be sorted in ascending order
-		 *   according to the data field named by the string.
-		 *  If an Array is provided, the data will be sorted according to the
-		 *   fields in the array. In addition, field names can optionally
-		 *   be followed by a boolean value. If true, the data is sorted in
-		 *   ascending order (the default). If false, the data is sorted in
-		 *   descending order.
-		 */
-		public function sortBy(a:*):void
-		{
-			var args:Array;
-			if (a is String) args = [a];
-			else if (a is Array)  args = a;
-			else throw new ArgumentError("Illegal input: "+a);
-			
-			var f:Function = Sort.sorter(args);
-			_list.sort(f);
-		}
-
-		// -- Visitation ------------------------------------------------------
-		
-		/**
-		 * Iterates over the contents of the list, invoking a visitor function
-		 * on each element of the list. If the visitor function returns a
-		 * Boolean true value, the iteration will stop with an early exit.
-		 * @param visitor the visitor function to be invoked on each item
-		 * @param reverse optional flag indicating if the list should be
-		 *  visited in reverse order
-		 * @param filter an optional boolean-valued function indicating which
-		 *  items should be visited
-		 * @return true if the visitation was interrupted with an early exit
-		 */		
-		public function visit(visitor:Function, reverse:Boolean=false,
-			filter:Function=null):Boolean
-		{
-			_visiting++; // mark a visit in process
-			var a:Array = _list; // use our own reference to the list
-			var i:uint, b:Boolean = false;
-			
-			if (reverse && filter==null) {
-				for (i=a.length; --i>=0;)
-					if (visitor(a[i]) as Boolean) {
-						b = true; break;
-					}
-			}
-			else if (reverse) {
-				for (i=a.length; --i>=0;)
-					if (filter(a[i]) && (visitor(a[i]) as Boolean)) {
-						b = true; break;
-					}
-			}
-			else if (filter==null) {
-				for (i=0; i<a.length; ++i)
-					if (visitor(a[i]) as Boolean) {
-						b = true; break;
-					}
-			}
-			else {
-				for (i=0; i<a.length; ++i)
-					if (filter(a[i]) && (visitor(a[i]) as Boolean)) {
-						b = true; break;
-					}
-			}
-			_visiting = Math.max(0, --_visiting); // unmark a visit in process
-			return b;
-		}
-		
-		// -- Default Values --------------------------------------------------
-		
-		/**
-		 * Sets a default property value for newly created items.
-		 * @param name the name of the property
-		 * @param value the value of the property
-		 */
-		public function setDefault(name:String, value:*):void
-		{
-			if (_defs == null) _defs = {};
-			_defs[name] = value;
-		}
-		
-		/**
-		 * Removes a default value for newly created items.
-		 * @param name the name of the property
-		 */
-		public function removeDefault(name:String):void
-		{
-			if (_defs != null) delete _defs[name];
-		}
-		
-		/**
-		 * Sets default values for newly created items.
-		 * @param values the default properties to set
-		 */
-		public function setDefaults(values:Object):void
-		{
-			if (_defs == null) _defs = {};
-			for (var name:String in values)
-				_defs[name] = values[name];
-		}
-		
-		/**
-		 * Clears all default value settings for this list.
-		 */
-		public function clearDefaults():void
-		{
-			_defs = null;
-		}
-		
-		/**
-		 * Applies the default values to an object.
-		 * @param o the object on which to set the default values
-		 * @param vals the set of default property values
-		 */
-		public function applyDefaults(o:Object):void
-		{
-			if (_defs == null) return;
-			for (var name:String in _defs) {
-				Property.$(name).setValue(o, _defs[name]);
-			}
-		}
-		
-		// -- Set Values ------------------------------------------------------
-		
-		/**
-		 * Sets a property value on all items in the list.
-		 * @param name the name of the property
-		 * @param value the value of the property
-		 * @param t a transitioner or time span for updating object values. If
-		 *  the input is a transitioner, it will be used to store the updated
-		 *  values. If the input is a number, a new Transitioner with duration
-		 *  set to the input value will be used. The input is null by default,
-		 *  in which case object values are updated immediately.
-		 * @return the transitioner used to update the values
-		 */
-		public function setProperty(name:String, value:*, t:*=null):Transitioner
-		{
-			var trans:Transitioner = Transitioner.instance(t);
-			for (var i:uint=0; i<_list.length; ++i)
-				trans.setValue(_list[i], name, value);
-			return trans;
-		}
-		
-		/**
-		 * Sets property values on all sprites in a given group.
-		 * @param vals an object containing the properties and values to set.
-		 * @param t a transitioner or time span for updating object values. If
-		 *  the input is a transitioner, it will be used to store the updated
-		 *  values. If the input is a number, a new Transitioner with duration
-		 *  set to the input value will be used. The input is null by default,
-		 *  in which case object values are updated immediately.
-		 * @return the transitioner used to update the values
-		 */
-		public function setProperties(vals:Object, t:*=null):Transitioner
-		{
-			var trans:Transitioner = Transitioner.instance(t);
-			for (var name:String in vals) {
-				for (var i:uint=0; i<_list.length; ++i)
-					trans.setValue(_list[i], name, vals[name]);
-			}
-			return trans;
-		}
-		
-		// -- Statistics ------------------------------------------------------
-				
-		/**
-		 * Computes and caches statistics for a data field. The resulting
-		 * <code>Stats</code> object is cached, so that later access does not
-		 * require any re-calculation. The cache of statistics objects may be
-		 * cleared, however, if changes to the data set are made.
-		 * @param field the property name
-		 * @return a <code>Stats</code> object with the computed statistics
-		 */
-		public function stats(field:String):Stats
-		{
-			// TODO: allow custom comparators?
-			
-			// check cache for stats
-			if (_stats[field] != undefined) {
-				return _stats[field] as Stats;
-			} else {
-				return _stats[field] = new Stats(_list, field);
-			}
-		}
-		
-		
-		/**
-		 * Clears any cached stats for the given field. 
-		 * @param field the data field to clear the stats for.
-		 */
-		public function clearStats(field:String):void
-		{
-			delete _stats[field];
-		}
-		
-		// -- Scales ----------------------------------------------------------
-		
-		/**
-		 * Create a new Scale instance for the given data field.
-		 * @param field the data property name to compute the scale for
-		 * @param which the data group (either NODES or EDGES) in which to look
-		 * @param scaleType the type of scale instance to generate
-		 * @return a Scale instance for the given data field
-		 * @see flare.vis.scale.Scales
-		 */
-		public function scale(field:String,
-			scaleType:String=ScaleType.LINEAR, ...rest):Scale
-		{
-			var scale:Scale = Scales.scale(stats(field), scaleType);
-			// TODO: lookup formatting info (?)
-			return scale;
-		}
-		
-		// -- Proxy Methods ---------------------------------------------------
-		
-		/** @private */
-		flash_proxy override function getProperty(name:*):*
-		{
-        	return _list[name];
-    	}
-    	
-    	/** @private */
-    	flash_proxy override function setProperty(name:*, value:*):void
-    	{
-    		this.setProperty(name, value);
-    	}
-		
-		/** @private */
-		flash_proxy override function nextNameIndex(idx:int):int
-		{
-			return (idx < _list.length ? idx + 1 : 0);
-		}
-
-		/** @private */
-		flash_proxy override function nextName(idx:int):String
-		{
-			return String(idx-1);
-		}
-		
-		/** @private */
-		flash_proxy override function nextValue(idx:int):*
-		{
-			return _list[idx-1];
-		}
-		
-	} // end of class DataList
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/data/DataSprite.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/data/DataSprite.as
deleted file mode 100644
index bfd1bc5ee6..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/data/DataSprite.as
+++ /dev/null
@@ -1,232 +0,0 @@
-package flare.vis.data
-{
-	import flash.display.Sprite;
-	import flash.geom.ColorTransform;
-	import flare.vis.data.render.IRenderer;
-	import flare.vis.data.render.ShapeRenderer;
-	import flash.display.DisplayObjectContainer;
-	import flash.display.DisplayObject;
-	import flare.util.Colors;
-	import flare.display.DirtySprite;
-
-	/**
-	 * Base class for display objects that represent visualized data.
-	 * DataSprites support a number of visual properties beyond those provided
-	 * by normal sprites. These include properties for colors, shape, size,
-	 * setting the position in polar coordinates (<code>angle</code> and
-	 * <code>radius</code>), and others.
-	 * 
-	 * <p>The actual appearance of DataSprite instances are determined using
-	 * pluggable renderers that draw graphical content for the sprite. These
-	 * renderers can be changed at runtime to dynamically control appearances.
-	 * Furthermore, since these are sprites, they can contain arbitrary display
-	 * objects as children on the display list, including entire nested
-	 * visualizations.</p>
-	 * 
-	 * <p>DataSprites provides two additional properties worth noting. First,
-	 * the <code>data</code> property references an object containing backing
-	 * data to be visualized. This data object is typically the data record
-	 * (or tuple) this DataSprite visually represents, and its values are often
-	 * used to determined visual encodings. Second, the <code>props</code>
-	 * objects is a dynamic object provided for attaching arbitrary properties
-	 * to a DataSprite instance. For example, some layout algorithms require
-	 * additional parameters on a per-item basis and store these values in the
-	 * <code>props</code> property.</p>
-	 */
-	public class DataSprite extends DirtySprite
-	{
-		// -- Properties ------------------------------------------------------
-		
-		/** The renderer for drawing this DataSprite. */
-		protected var _renderer:IRenderer = ShapeRenderer.instance;
-		/** Object storing backing data values. */
-		protected var _data:Object = {};
-		/** Object for attaching additional properties to this sprite. */
-		protected var _prop:Object = {};
-		
-		/** Fixed flag to prevent this sprite from being re-positioned. */
-		protected var _fixed:int = 0;
-		/** The fill color for this data sprite. This value is specified as an
-		 *  unsigned integer representing an ARGB color. Notice that this
-		 *  includes the alpha channel in the color value. */
-		protected var _fillColor:uint = 0xffcccccc;
-		/** The line color for this data sprite. This value is specified as an
-		 *  unsigned integer representing an ARGB color. Notice that this
-		 *  includes the alpha channel in the color value. */
-		protected var _lineColor:uint = 0xff000000;
-		/** The line width for this data sprite. */
-		protected var _lineWidth:Number = 0;
-				
-		/** The radius value of this sprite's position in polar co-ordinates.
-		 *  Polar co-ordinate values are determined from the 0,0 point of the
-		 *  parent container. */
-		protected var _radius:Number;
-		/** The angle value of this sprite's position in polar co-ordinates.
-		 *  Polar co-ordinate values are determined from the 0,0 point of the
-		 *  parent container. */
-		protected var _angle:Number;
-		/** Optional array of x,y values for specifying arbitrary shapes. */
-		protected var _points:Array;
-		/** Code indicating the shape value of this data sprite. */
-		protected var _shape:int = 0;
-		/** The size value of this data sprite (1 by default). */
-		protected var _size:Number = 1;
-		
-		/** Auxiliary property often used as a width parameter. */
-		protected var _w:Number = 0;
-		/** Auxiliary property often used as a height parameter. */
-		protected var _h:Number = 0;
-		/** Auxiliary property often used as a shape parameter. */
-		protected var _u:Number = 0;
-		/** Auxiliary property often used as a shape parameter. */
-		protected var _v:Number = 0;
-		
-		// -- General Properties -------------------------------
-		
-		/** The renderer for drawing this DataSprite. */
-		public function get renderer():IRenderer { return _renderer; }
-		public function set renderer(r:IRenderer):void { _renderer = r; dirty(); }
-		
-		/** Object storing backing data values. */
-		public function get data():Object { return _data; }
-		public function set data(d:Object):void { _data = d; }
-		
-		/** Object for attaching additional properties to this sprite. */
-		public function get props():Object { return _prop; }
-		public function set props(p:Object):void { _prop = p; _prop.self = this; }
-		
-		// -- Interaction Properties ---------------------------
-		
-		/** Fixed flag to prevent this sprite from being re-positioned. */
-		public function get fixed():Boolean { return _fixed > 0; }
-		/**
-		 * Increments the fixed counter. If the fixed counter is greater than
-		 * zero, the data sprite should be fixed. A counter is used so that if
-		 * different components both adjust the fixed settings, they won't
-		 * overwrite each other.
-		 * @param num the amount to increment the counter by (default 1)
-		 */
-		public function fix(num:uint=1):void { _fixed += num; }
-		/**
-		 * Decrements the fixed counter. If the fixed counter is greater than
-		 * zero, the data sprite should be fixed. A counter is used so that if
-		 * different components both adjust the fixed settings, they won't
-		 * overwrite each other. This method does not allow the fixed counter
-		 * to go below zero.
-		 * @param num the amount to decrement the counter by (default 1)
-		 */
-		public function unfix(num:uint=1):void { _fixed = Math.max(0, _fixed-num); }
-		 
-		// -- Visual Properties --------------------------------
-
-		/** @inheritDoc */
-		public override function set x(v:Number):void {
-			super.x = v; _radius = NaN; _angle = NaN;
-		}
-		/** @inheritDoc */
-		public override function set y(v:Number):void {
-			super.y = v; _radius = NaN; _angle = NaN;
-		}
-		
-		/** The radius value of this sprite's position in polar co-ordinates.
-		 *  Polar co-ordinate values are determined from the 0,0 point of the
-		 *  parent container. */
-		public function get radius():Number {
-			if (isNaN(_radius)) _radius = Math.sqrt(x*x + y*y);
-			return _radius;
-		}
-		public function set radius(r:Number):void {
-			var a:Number = angle;
-			super.x = r * Math.cos(a);
-			super.y = -r * Math.sin(a);
-			_radius = r;
-		}
-		
-		/** The angle value of this sprite's position in polar co-ordinates.
-		 *  Polar co-ordinate values are determined from the 0,0 point of the
-		 *  parent container. */
-		public function get angle():Number {
-			if (isNaN(_angle)) _angle = Math.atan2(-y, x);
-			return _angle;
-		}
-		public function set angle(a:Number):void {
-			var r:Number = radius;
-			super.x = r * Math.cos(a);
-			super.y = -r * Math.sin(a);
-			_angle = a;
-		}
-
-		/** Auxiliary property often used as a shape parameter. */
-		public function get u():Number { return _u; }
-		public function set u(u:Number):void { _u = u; dirty(); }
-		
-		/** Auxiliary property often used as a shape parameter. */
-		public function get v():Number { return _v; }
-		public function set v(v:Number):void { _v = v; dirty(); }
-		
-		/** Auxiliary property often used as a width parameter. */
-		public function get w():Number { return _w; }
-		public function set w(v:Number):void { _w = v; dirty(); }
-		
-		/** Auxiliary property often used as a height parameter. */
-		public function get h():Number { return _h; }
-		public function set h(v:Number):void { _h = v; dirty(); }
-		
-		/** The fill color for this data sprite. This value is specified as an
-		 *  unsigned integer representing an ARGB color. Notice that this
-		 *  includes the alpha channel in the color value. */
-		public function get fillColor():uint { return _fillColor; }
-		public function set fillColor(c:uint):void { _fillColor = c; dirty();	}
-		/** The alpha channel (as value between 0 and 1) for the fill color. */
-		public function get fillAlpha():Number { return Colors.a(_fillColor) / 255; }
-		public function set fillAlpha(a:Number):void {
-			_fillColor = Colors.setAlpha(_fillColor, uint(255*a)%256);
-			dirty();
-		}
-				
-		/** The line color for this data sprite. This value is specified as an
-		 *  unsigned integer representing an ARGB color. Notice that this
-		 *  includes the alpha channel in the color value. */
-		public function get lineColor():uint { return _lineColor; }
-		public function set lineColor(c:uint):void { _lineColor = c; dirty(); }
-		/** The alpha channel (as value between 0 and 1) for the line color. */
-		public function get lineAlpha():Number { return Colors.a(_lineColor) / 255; }
-		public function set lineAlpha(a:Number):void {
-			_lineColor = Colors.setAlpha(_lineColor, uint(255*a)%256);
-			dirty();
-		}
-		
-		/** The line width for this data sprite. */
-		public function get lineWidth():Number { return _lineWidth; }
-		public function set lineWidth(w:Number):void { _lineWidth = w; dirty(); }
-
-		/** The size value of this data sprite (1 by default). */
-		public function get size():Number { return _size; }
-		public function set size(s:Number):void { _size = s; dirty(); }
-
-		/** Code indicating the shape value of this data sprite. */
-		public function get shape():int { return _shape; }
-		public function set shape(s:int):void { _shape = s; dirty(); }
-		
-		/** Optional array of x,y values for specifying arbitrary shapes. */
-		public function get points():Array { return _points; }
-		public function set points(p:Array):void { _points = p; dirty(); }
-		
-		// -- Methods ---------------------------------------------------------
-
-		/**
-		 * Creates a new DataSprite.
-		 */		
-		public function DataSprite() {
-			super();
-			_prop.self = this;
-		}
-		
-		/** @inheritDoc */
-		public override function render() : void
-		{
-			if (_renderer != null) { _renderer.render(this); }
-		}
-
-	} // end of class DataSprite
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/data/EdgeSprite.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/data/EdgeSprite.as
deleted file mode 100644
index c5ac200ddc..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/data/EdgeSprite.as
+++ /dev/null
@@ -1,110 +0,0 @@
-package flare.vis.data
-{
-	import flash.events.Event;
-	import flare.vis.data.render.EdgeRenderer;
-	
-	/**
-	 * Visually represents a connection between two data elements. Examples
-	 * include an edge in a graph structure or a line between points in a line
-	 * chart. EdgeSprites maintain <code>source</code> and <code>target</code>
-	 * properties for accessing the NodeSprites connected by this edge. By
-	 * default, EdgeSprites are drawn using an <code>EdgeRenderer</code>.
-	 * EdgeSprites are typically managed by a <code>Data</code> object.
-	 */
-	public class EdgeSprite extends DataSprite
-	{
-		// -- Properties ------------------------------------------------------
-
-		private var _source:NodeSprite;
-		private var _target:NodeSprite;
-		private var _directed:Boolean = false;
-		
-		private var _x1:Number;
-		private var _y1:Number;
-		private var _x2:Number;
-		private var _y2:Number;
-		
-		/** The x-coordinate for the first end point of this edge. */
-		public function get x1():Number { return _x1; }
-		public function set x1(x:Number):void { _x1 = x; }
-		/** The y-coordinate for the first end point of this edge. */
-		public function get y1():Number { return _y1; }
-		public function set y1(y:Number):void { _y1 = y; }
-		/** The x-coordinate for the second end point of this edge. */
-		public function get x2():Number { return _x2; }
-		public function set x2(x:Number):void { _x2 = x; }
-		/** The y-coordinate for the second end point of this edge. */
-		public function get y2():Number { return _y2; }
-		public function set y2(y:Number):void { _y2 = y; }
-		
-		/** The first, or source, node upon which this edge is incident. */
-		public function get source():NodeSprite { return _source; }
-		public function set source(n:NodeSprite):void { _source = n; }
-		
-		/** The second, or target, node upon which this edge is incident. */
-		public function get target():NodeSprite { return _target; }
-		public function set target(n:NodeSprite):void { _target = n; }
-		
-		/** Flag indicating if this edge is directed (true) or undirected
-		 *  (false). */
-		public function get directed():Boolean { return _directed; }
-		public function set directed(b:Boolean):void { _directed = b; }
-		
-		
-		// -- Methods ---------------------------------------------------------
-		
-		/**
-		 * Creates a new EdgeSprite.
-		 * @param source the source node
-		 * @param target the target node
-		 * @param directed true for a directed edge, false for undirected
-		 */		
-		public function EdgeSprite(source:NodeSprite=null,
-			target:NodeSprite=null, directed:Boolean=false)
-		{
-			_source = source;
-			_target = target;
-			_directed = directed;
-			_lineColor = 0xffcccccc;
-			_renderer = EdgeRenderer.instance;
-			render();
-		}
-		
-		/**
-		 * Given a node upon which this edge is incident, return the other
-		 * node connected by this edge.
-		 * @param n a node upon which this edge is incident
-		 * @return the other node
-		 */		
-		public function other(n:NodeSprite):NodeSprite
-		{
-			if (n == _source) return _target;
-			if (n == _target) return _source;
-			else return null;	
-		}
-		
-		/**
-		 * Clears the edge, removing references to the edge's nodes.
-		 */		
-		public function clear():void
-		{
-			_source = null;
-			_target = null;
-		}
-		
-		/** @inheritDoc */
-		public override function render():void
-		{
-			if (_source != null) {
-				_x1 = _source.x;
-				_y1 = _source.y;
-			}
-			if (_target != null) {
-				_x2 = _target.x;
-				_y2 = _target.y;
-			}
-			super.render();
-		}
-		
-	} // end of class EdgeSprite
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/data/NodeSprite.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/data/NodeSprite.as
deleted file mode 100644
index d3ae746341..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/data/NodeSprite.as
+++ /dev/null
@@ -1,453 +0,0 @@
-package flare.vis.data
-{
-	import flare.util.Arrays;
-	
-	/**
-	 * Visually represents a data element, such as a data tuple or graph node.
-	 * By default, NodeSprites are drawn using a <codeShapeRenderer<code>.
-	 * NodeSprites are typically managed by a <code>Data</code> object.
-	 * 
-	 * <p>NodeSprites can separately maintain adjacency lists for both a
-	 * general graph structure (managing lists for inlinks and outlinks) and a
-	 * tree structure (managing a list for child links and a parent pointer).
-	 * The graph and tree lists are maintained completely separately to
-	 * maximize flexibility. While the the tree lists are often used to record
-	 * a spanning tree of the general network structure, they can also be used
-	 * to represent a hierarchy completely distinct from a co-existing graph
-	 * structure. Take this into account when iterating over the edges incident
-	 * on this node.</p>
-	 */
-	public class NodeSprite extends DataSprite
-	{
-		/** Flag indicating inlinks, edges that point to this node. */
-		public static const IN_LINKS:uint    = 1;
-		/** Flag indicating outlinks, edges that point away from node. */
-		public static const OUT_LINKS:uint   = 2;
-		/** Flag indicating both inlinks and outlinks. */
-		public static const GRAPH_LINKS:uint = 3;  // IN_LINKS | OUT_LINKS
-		/** Flag indicating child links in a tree structure. */
-		public static const CHILD_LINKS:uint = 4;
-		/** Flag indicating the link to a parent in a tree structure. */
-		public static const PARENT_LINK:uint = 8;
-		/** Flag indicating both child and parent links. */
-		public static const TREE_LINKS:uint  = 12; // CHILD_LINKS | PARENT_LINK
-		/** Flag indicating all links, including graph and tree links. */
-		public static const ALL_LINKS:uint   = 15; // GRAPH_LINKS | TREE_LINKS
-		/** Flag indicating that a traversal should be performed in reverse. */
-		public static const REVERSE:uint     = 16;
-		
-		// -- Properties ------------------------------------------------------
-		
-		private var _parentEdge:EdgeSprite;
-		private var _idx:int = -1; // node index in parent's array
-		private var _childEdges:/*EdgeSprite*/Array;
-		private var _inEdges:/*EdgeSprite*/Array;
-		private var _outEdges:/*EdgeSprite*/Array;
-		private var _expanded:Boolean = true;
-		
-		/** Flag indicating if this node is currently expanded. This flag can
-		 *  be used by layout routines to expand/collapse connections. */
-		public function get expanded():Boolean { return _expanded; }
-		public function set expanded(b:Boolean):void { _expanded = b; }
-		
-		/** The edge connecting this node to its parent in a tree structure. */
-		public function get parentEdge():EdgeSprite { return _parentEdge; }
-		public function set parentEdge(e:EdgeSprite):void { _parentEdge = e; }
-		
-		/** The index of this node in its tree parent's child links list. */
-		public function get parentIndex():int { return _idx; }
-		public function set parentIndex(i:int):void { _idx = i; }
-
-		// -- Node Degree Properties ------------------------------------------
-
-		/** The number of child links. */
-		public function get childDegree():uint { return _childEdges==null ? 0 : _childEdges.length; }
-		/** The number of inlinks and outlinks. */
-		public function get degree():uint { return inDegree + outDegree; }
-		/** The number of inlinks. */
-		public function get inDegree():uint { return _inEdges==null ? 0 : _inEdges.length; }
-		/** The number of outlinks. */
-		public function get outDegree():uint { return _outEdges==null ? 0 : _outEdges.length; }
-
-		/** The depth of this node in the tree structure. A value of zero
-		 *  indicates that this is a root node or that there is no tree. */
-		public function get depth():uint {
-			for (var d:uint=0, p:NodeSprite=parentNode; p!=null; p=p.parentNode, d++);
-			return d;
-		}
-
-		// -- Node Access Properties ---------------------------
-
-		/** The parent of this node in the tree structure. */
-		public function get parentNode():NodeSprite
-		{
-			return _parentEdge == null ? null : _parentEdge.other(this);
-		}
-		
-		/** The first child of this node in the tree structure. */
-		public function get firstChildNode():NodeSprite
-		{
-			return childDegree > 0 ? _childEdges[0].other(this) : null;
-		}
-		
-		/** The last child of this node in the tree structure. */
-		public function get lastChildNode():NodeSprite
-		{
-			var len:uint = childDegree;
-			return len > 0 ? _childEdges[len-1].other(this) : null;
-		}
-		
-		/** The next sibling of this node in the tree structure. */
-		public function get nextNode():NodeSprite
-		{
-			var p:NodeSprite = parentNode, i:int = _idx+1;
-			if (p == null || i >= p.childDegree) return null;
-			return parentNode.getChildNode(i);
-		}
-		
-		/** The previous sibling of this node in the tree structure. */
-		public function get prevNode():NodeSprite
-		{
-			var p:NodeSprite = parentNode, i:int = _idx-1;
-			if (p == null || i < 0) return null;
-			return parentNode.getChildNode(i);
-		}
-		
-		// -- Position Overrides -------------------------------
-
-		/** @inheritDoc */
-		public override function set x(v:Number):void
-		{
-			if (x!=v) dirtyEdges();
-			super.x = v;
-		}
-		/** @inheritDoc */
-		public override function set y(v:Number):void
-		{
-			if (y!=v) dirtyEdges();
-			super.y = v;
-		}
-		/** @inheritDoc */
-		public override function set radius(r:Number):void
-		{
-			if (_radius!=r) dirtyEdges();
-			super.radius = r;
-		}
-		/** @inheritDoc */
-		public override function set angle(a:Number):void
-		{
-			if (_angle!=a) dirtyEdges();
-			super.angle = a;
-		}
-		
-		// -- Methods ---------------------------------------------------------
-
-		/** Mark all incident edges as dirty. */
-		private function dirtyEdges():void
-		{
-			var e:EdgeSprite;
-			if (_parentEdge) _parentEdge.dirty();
-			if (_childEdges) for each (e in _childEdges) { e.dirty(); }
-			if (_outEdges)   for each (e in _outEdges)   { e.dirty(); }
-			if (_inEdges)    for each (e in _inEdges)    { e.dirty(); }
-		}
-		
-		// -- Test Methods -------------------------------------
-		
-		/**
-		 * Indicates if the input node is connected to this node by an edge.
-		 * @param n the node to check for connection
-		 * @param opt flag indicating which links to check
-		 * @return true if connected, false otherwise
-		 */		
-		public function isConnected(n:NodeSprite, opt:uint=ALL_LINKS):Boolean
-		{
-			return visitNodes(
-				function(d:NodeSprite):Boolean { return n==d; },
-				opt);
-		}
-
-		// -- Accessor Methods ---------------------------------
-		
-		/**
-		 * Gets the child edge at the specified position
-		 * @param i the position of the child edge
-		 * @return the child edge
-		 */		
-		public function getChildEdge(i:uint):EdgeSprite
-		{
-			return _childEdges[i];
-		}
-		
-		/**
-		 * Gets the child node at the specified position
-		 * @param i the position of the child node
-		 * @return the child node
-		 */
-		public function getChildNode(i:uint):NodeSprite
-		{
-			return _childEdges[i].other(this);
-		}
-		
-		/**
-		 * Gets the inlink edge at the specified position
-		 * @param i the position of the inlink edge
-		 * @return the inlink edge
-		 */
-		public function getInEdge(i:uint):EdgeSprite
-		{
-			return _inEdges[i];
-		}
-		
-		/**
-		 * Gets the inlink node at the specified position
-		 * @param i the position of the inlink node
-		 * @return the inlink node
-		 */
-		public function getInNode(i:uint):NodeSprite
-		{
-			return _inEdges[i].source;
-		}
-		
-		/**
-		 * Gets the outlink edge at the specified position
-		 * @param i the position of the outlink edge
-		 * @return the outlink edge
-		 */
-		public function getOutEdge(i:uint):EdgeSprite
-		{
-			return _outEdges[i];
-		}
-		
-		/**
-		 * Gets the outlink node at the specified position
-		 * @param i the position of the outlink node
-		 * @return the outlink node
-		 */
-		public function getOutNode(i:uint):NodeSprite
-		{
-			return _outEdges[i].target;
-		}
-		
-		// -- Mutator Methods ----------------------------------
-		
-		/**
-		 * Adds a child edge to this node.
-		 * @param e the edge to add to the child links list
-		 * @return the index of the added edge in the list
-		 */
-		public function addChildEdge(e:EdgeSprite):uint
-		{
-			if (_childEdges == null) _childEdges = new Array();
-			_childEdges.push(e);
-			return _childEdges.length - 1;
-		}
-		
-		/**
-		 * Adds an inlink edge to this node.
-		 * @param e the edge to add to the inlinks list
-		 * @return the index of the added edge in the list
-		 */
-		public function addInEdge(e:EdgeSprite):uint
-		{
-			if (_inEdges == null) _inEdges = new Array();
-			_inEdges.push(e);
-			return _inEdges.length - 1;
-		}
-		
-		/**
-		 * Adds an outlink edge to this node.
-		 * @param e the edge to add to the outlinks list
-		 * @return the index of the added edge in the list
-		 */
-		public function addOutEdge(e:EdgeSprite):uint
-		{
-			if (_outEdges == null) _outEdges = new Array();
-			_outEdges.push(e);
-			return _outEdges.length - 1;
-		}
-		
-		/**
-		 * Removes all edges incident on this node. Note that this method
-		 * does not update the edges themselves or the other nodes.
-		 */
-		public function removeAllEdges():void
-		{
-			removeEdges(ALL_LINKS);
-		}
-		
-		/**
-		 * Removes all edges of the indicated edge type. Note that this method
-		 * does not update the edges themselves or the other nodes.
-		 * @param type the type of edges to remove. For example, IN_LINKS,
-		 *  OUT_LINKS, TREE_LINKS, etc.
-		 */
-		public function removeEdges(type:int):void
-		{
-			var e:EdgeSprite;
-			if (type & PARENT_LINK && _parentEdge) {
-				_parentEdge = null;
-			}
-			if (type & CHILD_LINKS && _childEdges) {
-				while (_childEdges.length > 0) { e=_childEdges.pop(); }
-			}
-			if (type & OUT_LINKS && _outEdges) {
-				while (_outEdges.length > 0) { e=_outEdges.pop(); }
-			}
-			if (type & IN_LINKS && _inEdges) {
-				while (_inEdges.length > 0) { e=_inEdges.pop(); }	
-			}
-		}
-		
-		/**
-		 * Removes an edge from the child links list. Note that this method
-		 * does not update the edge itself or the other node.
-		 * @param e the edge to remove
-		 */
-		public function removeChildEdge(e:EdgeSprite):void
-		{
-			Arrays.remove(_childEdges, e);
-		}
-		
-		/**
-		 * Removes an edge from the inlinks list. Note that this method
-		 * does not update the edge itself or the other node.
-		 * @param e the edge to remove
-		 */
-		public function removeInEdge(e:EdgeSprite):void
-		{
-			Arrays.remove(_inEdges, e);
-		}
-		
-		/**
-		 * Removes an edge from the outlinks list. Note that this method
-		 * does not update the edge itself or the other node.
-		 * @param e the edge to remove
-		 */
-		public function removeOutEdge(e:EdgeSprite):void
-		{
-			Arrays.remove(_outEdges, e);
-		}
-		
-		// -- Visitor Methods --------------------------------------------------
-		
-		/**
-		 * Visits this node's edges, invoking a function on each visited edge.
-		 * @param f the function to invoke on the edges. If the function
-		 *  returns true, the visitation is ended with an early exit.
-		 * @param opt flag indicating which sets of edges should be visited
-		 * @return true if the visitation was interrupted with an early exit
-		 */
-		public function visitEdges(f:Function, opt:uint=ALL_LINKS):Boolean
-		{
-			var rev:Boolean = (opt & REVERSE) > 0;
-			if (opt & IN_LINKS && _inEdges != null) { 
-				if (visitEdgeHelper(f, _inEdges, rev)) return true;
-			}
-			if (opt & OUT_LINKS && _outEdges != null) {
-				if (visitEdgeHelper(f, _outEdges, rev)) return true;
-			}
-			if (opt & CHILD_LINKS && _childEdges != null) {
-				if (visitEdgeHelper(f, _childEdges, rev)) return true;
-			}
-			if (opt & PARENT_LINK && _parentEdge != null) {
-				if (f(_parentEdge)) return true;
-			}
-			return false;
-		}
-		
-		private function visitEdgeHelper(f:Function, a:Array, r:Boolean):Boolean
-		{
-			var i:uint, v:*;
-			if (r) {
-				for (i=a.length; --i>=0;) {
-					if (f(a[i]) as Boolean) return true;
-				}
-			} else {
-				for (i=0; i<a.length; ++i) {
-					if (f(a[i]) as Boolean) return true;
-				}
-			}
-			return false;
-		}
-		
-		/**
-		 * Visits the nodes connected to this node by edges, invoking a
-		 * function on each visited node.
-		 * @param f the function to invoke on the nodes. If the function
-		 *  returns true, the visitation is ended with an early exit.
-		 * @param opt flag indicating which sets of edges should be traversed
-		 * @return true if the visitation was interrupted with an early exit
-		 */
-		public function visitNodes(f:Function, opt:uint=ALL_LINKS):Boolean
-		{
-			var rev:Boolean = (opt & REVERSE) > 0;
-			if (opt & IN_LINKS && _inEdges != null) {
-				if (visitNodeHelper(f, _inEdges, rev)) return true;
-			}
-			if (opt & OUT_LINKS && _outEdges != null) {
-				if (visitNodeHelper(f, _outEdges, rev)) return true;
-			}
-			if (opt & CHILD_LINKS && _childEdges != null) {
-				if (visitNodeHelper(f, _childEdges, rev)) return true;
-			}
-			if (opt & PARENT_LINK && _parentEdge != null) {
-				if (f(_parentEdge.other(this))) return true;
-			}
-			return false;
-		}
-		
-		private function visitNodeHelper(f:Function, a:Array, r:Boolean):Boolean
-		{
-			var i:uint;
-			if (r) {
-				for (i=a.length; --i>=0;)
-					if (f(a[i].other(this)) as Boolean) return true;
-			} else {
-				for (i=0; i<a.length; ++i)
-					if (f(a[i].other(this)) as Boolean) return true;
-			}
-			return false;
-		}
-		
-		/**
-		 * Visits the subtree rooted at this node using a depth first search,
-		 * invoking the input function on each visited node.
-		 * @param f the function to invoke on the nodes. If the function
-		 *  returns true, the visitation is ended with an early exit.
-		 * @param preorder if true, nodes are visited in a pre-order traversal;
-		 *  if false, they are visited in a post-order traversal
-		 * @return true if the visitation was interrupted with an early exit
-		 */
-		public function visitTreeDepthFirst(f:Function, preorder:Boolean=false):Boolean
-		{
-			if (preorder && (f(this) as Boolean)) return true;
-			for (var i:uint = 0; i<childDegree; ++i) {
-				if (getChildNode(i).visitTreeDepthFirst(f)) return true;
-			}
-			if (!preorder && (f(this) as Boolean)) return false;
-			return false;
-		}
-		
-		/**
-		 * Visits the subtree rooted at this node using a breadth first search,
-		 * invoking the input function on each visited node.
-		 * @param f the function to invoke on the nodes. If the function
-		 *  returns true, the visitation is ended with an early exit.
-		 * @return true if the visitation was interrupted with an early exit
-		 */
-		public function visitTreeBreadthFirst(f:Function):Boolean
-		{
-			var q:Array = new Array(), x:NodeSprite;
-			
-			q.push(this);
-			while (q.length > 0) {
-				if (f(x=q.shift()) as Boolean) return true;
-				for (var i:uint = 0; i<x.childDegree; ++i)
-					q.push(x.getChildNode(i));
-			}
-			return false;
-		}
-		
-	} // end of class NodeSprite
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/data/Tree.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/data/Tree.as
deleted file mode 100644
index ba576879f4..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/data/Tree.as
+++ /dev/null
@@ -1,215 +0,0 @@
-package flare.vis.data
-{	
-	/**
-	 * Data structure for managing a collection of visual data objects in a
-	 * tree (hierarchy) structure. This class extends the functionality of
-	 * the Data class to model a hierarchy. The class can be used as an
-	 * alternative to the Data class when the data forms a strict tree, or to
-	 * model a spanning tree over a general graph.
-	 */
-	public class Tree extends Data
-	{	
-		/**
-		 * Sets the root node of this tree. This property can only be set
-		 * when the tree does not yet have a root node. */
-		public override function set root(n:NodeSprite):void {
-			if (_root == null) {
-				super.addNode(n); _root = n; _root.parentIndex = -1;
-			} else {
-				throw new ArgumentError("Can't set root unless the tree is empty." +
-				"If you want to set an entirely new root, call clear() first.");
-			}
-		}
-		
-		/** This property simply points back to this object. */
-		public override function get tree():Tree { return this; }
-		public override function set tree(t:Tree):void { /* do nothing */ }
-		
-		// -- Methods ---------------------------------------------------------
-		
-		/**
-		 * Creates and returns a new root NodeSprite for the tree. If the
-		 * tree already has a root, this method throws an error.
-		 * @return the newly added root
-		 */
-		public function addRoot():NodeSprite
-		{
-			if (_root != null) throw new Error(
-				"addRoot can only be called on an empty tree!");
-			return (_root = super.addNode());
-		}
-		
-		/**
-		 * Add a node to the tree. If the child node argument is null,
-		 * a new NodeSprite will be created. A new EdgeSprite connecting
-		 * the nodes will be created. Returns the new child node.
-		 * @param p the parent node
-		 * @param c the child node. If null, a new child node is created.
-		 * @return the new child node
-		 */
-		public function addChild(p:NodeSprite, c:NodeSprite=null):NodeSprite
-		{			
-			if (!_nodes.contains(p)) {
-				throw new ArgumentError("Parent node must be in the tree!");
-			}
-			c = super.addNode(c);
-			var e:EdgeSprite = newEdge(p, c, directedEdges, null);
-			c.parentIndex = p.addChildEdge(e);
-			c.parentEdge = e;
-			super.addEdge(e);
-			return c;
-		}
-		
-		/**
-		 * Adds the given edge as a child edge between a node already
-		 * in the tree and another node not yet in the tree.
-		 * @param e the edge to add to the tree
-		 * @return the newly added edge
-		 */
-		public function addChildEdge(e:EdgeSprite):EdgeSprite
-		{
-			var n1:NodeSprite = e.source, b1:Boolean = _nodes.contains(n1);
-			var n2:NodeSprite = e.target, b2:Boolean = _nodes.contains(n2);
-			
-			if (b1 && b2)
-				throw new ArgumentError("One node must not be in the tree");
-			if (!(b1 || b2))
-				throw new ArgumentError("One node must already be in the tree");
-				
-			var p:NodeSprite = b1 ? n1 : n2;
-			var c:NodeSprite = b1 ? n2 : n1;
-			
-			c.parentEdge = e;
-			c.parentIndex = p.addChildEdge(e);
-			
-			super.addNode(c);
-			return super.addEdge(e);
-		}
-		
-		/**
-		 * Clears the tree, removing all nodes and edges.
-		 */
-		public override function clear():void
-		{
-			super.clear(); _root = null;
-		}
-		
-		/**
-		 * Removes a node from the tree, removing the entire
-		 * subtree rooted at that node.
-		 * @param n the node to remove
-		 * @return true if the node was successfully removed, false otherwise
-		 */
-		public override function removeNode(n:NodeSprite):Boolean
-		{
-			if (n==_root) {
-				clear(); return true;
-			} else {
-				return removeEdge(n.parentEdge);
-			}
-		}
-		
-		/**
-		 * Removes an edge from tree tree, removing the entire
-		 * subtree rooted at the child node adjacent to the edge.
-		 * @param e the edge to remove from the tree
-		 * @return true if the edge was successfully removed, false otherwise
-		 */
-		public override function removeEdge(e:EdgeSprite):Boolean
-		{
-			if (e==null || !_edges.contains(e)) return false;
-			
-			// disconnect tree
-			var c:NodeSprite = (e.target.parentNode==e.source ? e.target : e.source);
-			var p:NodeSprite = c.parentNode;
-			var i:int = c.parentIndex;
-			p.removeChildEdge(e);
-			
-			// walk disconnected segment to fire updates
-			c.visitTreeDepthFirst(function(n:NodeSprite):void {
-				removeInternal(n.parentEdge, _edges);
-				removeInternal(n, _nodes);
-			});
-			removeInternal(e, _edges);
-			
-			// update parent index values
-			for (; i<p.childDegree; ++i) {
-				p.getChildNode(i).parentIndex = i;
-			}
-			return true;	
-		}
-
-		// --------------------------------------------------------------------
-		
-		/**
-		 * Counts the number of leaf nodes in the tree.
-		 * @return the number of leaf nodes
-		 */
-		public function countLeaves():int
-		{
-			var leaves:int = 0;
-			for each (var ns:NodeSprite in _nodes.list) {
-				if (ns.childDegree == 0) ++leaves;
-			}
-			return leaves;
-		}
-
-		// --------------------------------------------------------------------
-
-		/**
-		 * Continuously swaps the given node with its parent node
-		 * until it is the root.
-		 * <p>
-		 * <strong>WARNING:</strong> this method causes connecting edges to be
-		 * reconfigured. If this tree is a spanning tree, this can cause havoc.
-		 * </p>
-		 * @param n the node to swap with its parent until it becomes the root
-		 */
-		public function swapToRoot(n:NodeSprite):void
-		{
-			while (n.parent != null) {
-				swapWithParent(n);
-			}
-		}
-
-		/**
-		 * Swaps the given node with its parent node.
-		 * <p>
-		 * <strong>WARNING:</strong> this method causes connecting edges to be
-		 * reconfigured. If this tree is a spanning tree, this can cause havoc.
-		 * </p>
-		 * @param n the node to swap with its parent
-		 */
-		public function swapWithParent(n:NodeSprite):void
-		{
-			var p:NodeSprite = n.parentNode, gp:NodeSprite;
-			var e:EdgeSprite, ge:EdgeSprite, idx:int;
-			if (p==null) return;
-			
-			gp = p.parentNode;
-			ge = p.parentEdge;
-			idx = p.parentIndex;
-			
-			// swap parent edge
-			e = n.parentEdge;
-			p.removeChild(n);
-			p.parentEdge = e;
-			p.parentIndex = n.addChildEdge(e);
-			
-			// connect to grandparents
-			if (gp==null) {
-				n.parentIndex = -1;
-				n.parentEdge = null;
-			} else {
-				if (ge.source == gp) {
-					ge.target = n;
-				} else {
-					ge.source = n;
-				}
-				n.parentIndex = idx;
-				n.parentEdge = ge;
-			}
-		}
-
-	} // end of class Tree
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/data/render/EdgeRenderer.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/data/render/EdgeRenderer.as
deleted file mode 100644
index 3cd89883b1..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/data/render/EdgeRenderer.as
+++ /dev/null
@@ -1,93 +0,0 @@
-package flare.vis.data.render
-{
-	import flare.vis.data.DataSprite;
-	import flare.vis.data.EdgeSprite;
-	import flare.vis.data.NodeSprite;
-	import flare.vis.util.graphics.GraphicsUtil;
-	import flare.vis.util.graphics.Shapes;
-	
-	import flash.display.Graphics;
-
-	/**
-	 * Renderer that draws edges as lines. The EdgeRenderer supports straight
-	 * lines, poly lines, and curves as Bezier or cardinal splines. The type
-	 * of edge drawn is determined from an EdgeSprite's <code>shape</code>
-	 * property and control points found in the <code>points</code> property.
-	 * The line rendering properties are set by the <code>setLineStyle</code>
-	 * method, which can be overridden by subclasses. By default, the line
-	 * rendering settings are determined using default property values set
-	 * on this class (for example, the <code>scaleMode<code> and 
-	 * <code>caps</code> properties).
-	 */
-	public class EdgeRenderer implements IRenderer
-	{
-		private static var _instance:EdgeRenderer = new EdgeRenderer();
-		/** Static EdgeRenderer instance. */
-		public static function get instance():EdgeRenderer { return _instance; }
-		
-		/** Pixel hinting flag for line rendering. */
-		public var pixelHinting:Boolean = false;
-		/** Scale mode for line rendering (normal by default). */
-		public var scaleMode:String = "normal";
-		/** The joint style for line rendering. */
-		public var joints:String = null;
-		/** The caps style for line rendering. */
-		public var caps:String = null;
-		/** The miter limit for line rendering. */
-		public var miterLimit:int = 3;
-		
-		/** @inheritDoc */
-		public function render(d:DataSprite):void
-		{
-			var e:EdgeSprite = d as EdgeSprite;
-			if (e == null) { return; } // TODO: throw exception?
-			var s:NodeSprite = e.source;
-			var t:NodeSprite = e.target;
-			var g:Graphics = e.graphics;
-			
-			if (s==null || t==null) { g.clear(); return; }
-			
-			var ctrls:Array = e.points as Array;
-				
-			g.clear(); // clear it out
-			setLineStyle(e, g); // set the line style
-			
-			if (e.shape == Shapes.BEZIER && ctrls != null && ctrls.length > 1) {
-				if (ctrls.length < 4)
-				{
-					g.moveTo(e.x1, e.y1);
-					g.curveTo(ctrls[0], ctrls[1], e.x2, e.y2);
-				}
-				else
-				{
-					GraphicsUtil.drawCubic(g, e.x1, e.y1, ctrls[0], ctrls[1],
-										   ctrls[2], ctrls[3], e.x2, e.y2);
-				}
-			} else if (e.shape == Shapes.CARDINAL) {
-				GraphicsUtil.drawCardinal2(g, e.x1, e.y1, ctrls, e.x2, e.y2);
-			} else {
-				g.moveTo(e.x1, e.y1);
-				if (ctrls != null) {
-					for (var i:uint=0; i<ctrls.length; i+=2)
-						g.lineTo(ctrls[i], ctrls[i+1]);
-				}
-				g.lineTo(e.x2, e.y2);
-			}
-		}
-		
-		/**
-		 * Sets the line style for edge rendering.
-		 * @param e the EdgeSprite to render
-		 * @param g the Graphics context to draw with
-		 */
-		protected function setLineStyle(e:EdgeSprite, g:Graphics):void
-		{
-			var lineAlpha:Number = e.lineAlpha;
-			if (lineAlpha == 0) return;
-			
-			g.lineStyle(e.lineWidth, e.lineColor, lineAlpha, 
-				pixelHinting, scaleMode, caps, joints, miterLimit);
-		}
-
-	} // end of class EdgeRenderer
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/data/render/IRenderer.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/data/render/IRenderer.as
deleted file mode 100644
index 2e316b8f2c..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/data/render/IRenderer.as
+++ /dev/null
@@ -1,17 +0,0 @@
-package flare.vis.data.render
-{
-	import flare.vis.data.DataSprite;
-	
-	/**
-	 * Interface for DataSprite rendering modules.
-	 */
-	public interface IRenderer
-	{
-		/**
-		 * Renders drawing content for the input DataSprite.
-		 * @param d the DataSprite to draw
-		 */
-		function render(d:DataSprite):void;
-		
-	} // end of interface IRenderer
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/data/render/NullRenderer.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/data/render/NullRenderer.as
deleted file mode 100644
index 9c12f00692..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/data/render/NullRenderer.as
+++ /dev/null
@@ -1,22 +0,0 @@
-package flare.vis.data.render
-{
-	import flare.vis.data.DataSprite;
-
-	/**
-	 * Renderer that draws nothing.
-	 */
-	public class NullRenderer implements IRenderer
-	{
-		private static const _instance:NullRenderer = new NullRenderer();
-		
-		/** Static NullRenderer instance. */
-		public static function get instance():NullRenderer { return _instance; }
-		
-		/** @inheritDoc */
-		public function render(d:DataSprite):void
-		{
-			d.graphics.clear();
-		}
-		
-	} // end of class NullRenderer
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/data/render/ShapeRenderer.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/data/render/ShapeRenderer.as
deleted file mode 100644
index 1aa08d1c16..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/data/render/ShapeRenderer.as
+++ /dev/null
@@ -1,67 +0,0 @@
-package flare.vis.data.render
-{
-	import flare.vis.data.DataSprite;
-	import flash.display.Graphics;
-	import flare.vis.util.graphics.Shapes;
-	import flare.vis.util.graphics.GraphicsUtil;
-	import flare.vis.palette.ShapePalette;
-
-	/**
-	 * Renderer that draws shapes. The ShapeRender uses a ShapePalette instance
-	 * as needed to look up shape drawing routines based on a DataSprite's
-	 * shape property.
-	 * @see flare.vis.palette.ShapePalette
-	 */
-	public class ShapeRenderer implements IRenderer
-	{
-		private static var _instance:ShapeRenderer = new ShapeRenderer();
-		/** Static ShapeRenderer instance. */
-		public static function get instance():ShapeRenderer { return _instance; }
-		
-		/** The default size value for drawn shapes. This value is multiplied
-		 *  by a DataSprite's size property to determine the final size. */
-		public var defaultSize:Number = 6;
-		/** The ShapePalette used by this renderer to draw shapes. */
-		public var shapePalette:ShapePalette = ShapePalette.defaultPalette();
-		
-		/** @inheritDoc */
-		public function render(d:DataSprite):void
-		{
-			var lineAlpha:Number = d.lineAlpha;
-			var fillAlpha:Number = d.fillAlpha;
-			var size:Number = d.size * defaultSize;
-			
-			var g:Graphics = d.graphics;
-			g.clear();
-			if (fillAlpha > 0) g.beginFill(d.fillColor, fillAlpha);
-			if (lineAlpha > 0) g.lineStyle(d.lineWidth, d.lineColor, lineAlpha);
-			
-			switch (d.shape) {
-				case Shapes.BLOCK:
-					g.drawRect(d.u-d.x, d.v-d.y, d.w, d.h);
-					break;
-				case Shapes.POLYGON:
-					if (d.points!=null) GraphicsUtil.drawPolygon(g, d.points);
-					break;
-				case Shapes.POLYBLOB:
-					if (d.points!=null) GraphicsUtil.drawPolygon(g, d.points);
-					break;
-				case Shapes.VERTICAL_BAR:
-					g.drawRect(-size/2, -d.h, size, d.h); 
-					break;
-				case Shapes.HORIZONTAL_BAR:
-					g.drawRect(-d.w, -size/2, d.w, size);
-					break;
-				case Shapes.WEDGE:
-					GraphicsUtil.drawWedge(g, -d.x, -d.y, 
-								  d.h, d.v, d.u, d.u+d.w);
-					break;
-				default:
-					shapePalette.getShape(d.shape)(g, size);
-			}
-			
-			if (fillAlpha > 0) g.endFill();
-		}
-		
-	} // end of class ShapeRenderer
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/events/DataEvent.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/events/DataEvent.as
deleted file mode 100644
index d74d5c87a3..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/events/DataEvent.as
+++ /dev/null
@@ -1,54 +0,0 @@
-package flare.vis.events
-{
-	import flash.events.Event;
-	import flare.vis.data.Data;
-	import flare.vis.data.DataSprite;
-	import flare.vis.data.NodeSprite;
-	import flare.vis.data.EdgeSprite;
-	
-	/**
-	 * Event fired when a <code>Data</code> instance is modified.
-	 */
-	public class DataEvent extends Event
-	{
-		/** A data added event. */
-		public static const DATA_ADDED:String   = "DATA_ADDED";
-		/** A data removed event. */
-		public static const DATA_REMOVED:String = "DATA_REMOVED";
-		/** A data updated event. */
-		public static const DATA_UPDATED:String = "DATA_UPDATED";
-		
-		private var _data:Data;
-		private var _item:DataSprite;
-		
-		/** The Data instance that was modified. */
-		public function get data():Data { return _data; }
-		/** The DataSprite that was added/removed/updated. */
-		public function get item():DataSprite { return _item; }
-		/** The NodeSprite that was added/removed/updated. */
-		public function get node():NodeSprite { return _item as NodeSprite; }
-		/** The EdgeSprite that was added/removed/updated. */
-		public function get edge():EdgeSprite { return _item as EdgeSprite; }
-		
-		/**
-		 * Creates a new DataEvent.
-		 * @param type the event type (DATA_ADDED, DATA_REMOVED, or
-		 *  DATA_UPDATED)
-		 * @param data the Data instance that was modified
-		 * @param item the DataSprite that was added, removed, or updated
-		 */		
-		public function DataEvent(type:String, data:Data, item:DataSprite)
-		{
-			super(type);
-			_data = data;
-			_item = item;
-		}
-		
-		/** @inheritDoc */
-		public override function clone():Event
-		{
-			return new DataEvent(type, _data, _item);
-		}
-		
-	} // end of class DataEvent
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/events/VisualizationEvent.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/events/VisualizationEvent.as
deleted file mode 100644
index 277be41bb2..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/events/VisualizationEvent.as
+++ /dev/null
@@ -1,31 +0,0 @@
-package flare.vis.events
-{
-	import flash.events.Event;
-	import flare.animate.Transitioner;
-
-	/**
-	 * Event fired in response to visualization updates.
-	 */
-	public class VisualizationEvent extends Event
-	{
-		/** A visualization update event. */
-		public static const UPDATE:String = "update";
-		
-		private var _trans:Transitioner;
-		
-		/** Transitioner used in the visualization update. */
-		public function get transitioner():Transitioner { return _trans; }
-		
-		/**
-		 * Creates a new VisualizationEvent.
-		 * @param type the event type
-		 * @param trans the Transitioner used in the visualization update
-		 */		
-		public function VisualizationEvent(type:String, trans:Transitioner=null)
-		{
-			super(type);
-			_trans = trans==null ? Transitioner.DEFAULT : trans;
-		}
-		
-	} // end of class VisualizationEvent
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/legend/Legend.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/legend/Legend.as
deleted file mode 100644
index d0971f4652..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/legend/Legend.as
+++ /dev/null
@@ -1,395 +0,0 @@
-package flare.vis.legend
-{
-	import flare.animate.Transitioner;
-	import flare.display.RectSprite;
-	import flare.display.TextSprite;
-	import flare.vis.Visualization;
-	import flare.vis.operator.IOperator;
-	import flare.vis.operator.encoder.ColorEncoder;
-	import flare.vis.operator.encoder.Encoder;
-	import flare.vis.operator.encoder.ShapeEncoder;
-	import flare.vis.operator.encoder.SizeEncoder;
-	import flare.vis.palette.ColorPalette;
-	import flare.vis.palette.ShapePalette;
-	import flare.vis.palette.SizePalette;
-	import flare.vis.scale.OrdinalScale;
-	import flare.vis.scale.Scale;
-	
-	import flash.display.Sprite;
-	import flash.geom.Rectangle;
-	import flash.text.TextFormat;
-	
-	/**
-	 * A legend describing the visual encoding of a data property. The Legend
-	 * class supports discrete legends that list individual items and
-	 * continuous legends the convey a continuous range of values.
-	 */
-	public class Legend extends Sprite
-	{
-		/** Constant indicating a left-to-right orientation */
-		public static const LEFT_TO_RIGHT:uint = 0;
-		/** Constant indicating a right-to-left orientation */
-		public static const RIGHT_TO_LEFT:uint = 1;
-		/** Constant indicating a top-to-bottom orientation */
-		public static const TOP_TO_BOTTOM:uint = 2;
-		/** Constant indicating a bottom-to-top orientation */
-		public static const BOTTOM_TO_TOP:uint = 3;
-
-		/** The layout bounds for this legend instance. */
-		protected var _bounds:Rectangle = new Rectangle(0, 0, 200, 500);
-		/** The data field this legend describes. */
-		protected var _dataField:String;
-
-		/** Sprite defining the border of the legend. */
-		protected var _border:RectSprite;
-		/** Sprite containing the legend items. */
-		protected var _items:Sprite;
-		/** TextSprite containing the legend title.*/
-		protected var _title:TextSprite;
-		
-		/** Scale instance used to define the legend mapping. */
-		protected var _scale:Scale;
-		/** Flag indicating if this legend is discrete or continuous. */
-		protected var _discrete:Boolean = true;
-		
-		/** The default color to use for legend items. */
-		protected var _defaultColor:uint = 0xffbbbbbb;
-		/** The color palette used to encode values (may be null). */
-		protected var _colors:ColorPalette;
-		/** The shape palette used to encode values (may be null). */
-		protected var _shapes:ShapePalette;
-		/** The size palette used to encode values (may be null). */
-		protected var _sizes:SizePalette;
-		
-		/** Flag indicating the desired orientation of this legend. */
-		protected var _orient:int = TOP_TO_BOTTOM;
-		/** Margin spacing value. */
-		protected var _margin:Number = 2;
-		
-		/** Label formatting string for legend items. */
-		protected var _labelFormat:String = null;
-		/** TextFormat (font, size, style) of legend item labels. */
-		protected var _labelTextFormat:TextFormat = new TextFormat("Arial",12,0);
-	
-		/** The calculated internal width of the legend. */
-		protected var _iw:Number;
-		/** The calculated internal height of the legend. */
-		protected var _ih:Number;
-
-		// -- Properties ------------------------------------------------------
-
-		/** The data field this legend describes. */
-		public function get dataField():String { return _dataField; }
-
-		/** The layout bounds for this legend instance. */
-		public function get layoutBounds():Rectangle { return _bounds; }
-		public function set layoutBounds(b:Rectangle):void { _bounds = b; }
-		
-		/** Sprite defining the border of the legend. */
-		public function get border():RectSprite { return _border; }
-		/** Sprite containing the legend items. */
-		public function get items():Sprite { return _items; }
-		/** TextSprite containing the legend title.*/
-		public function get title():TextSprite { return _title; }
-		
-		/** Flag indicating if this legend is discrete or continuous. */
-		public function get discrete():Boolean { return _discrete; }
-		
-		/** Scale instance used to define the legend mapping. */
-		public function get scale():Scale { return _scale; }
-		public function set scale(s:Scale):void {
-			_scale = s; 
-			_discrete = s ? _scale is OrdinalScale : true;
-		}
-		/** The LegendRange for this legend, if it is continuous. This
-		 *  value is null if the legend is discrete. */
-		public function get range():LegendRange {
-			return _discrete ? null : LegendRange(_items.getChildAt(0));
-		}
-
-		/** The default color to use for legend items. */		
-		public function get defaultColor():uint { return _defaultColor; }
-		public function set defaultColor(c:uint):void { _defaultColor = c; }
-
-		/** The color palette used to encode values (may be null). */		
-		public function get colorPalette():ColorPalette { return _colors; }
-		public function set colorPalette(cp:ColorPalette):void { _colors = cp; }
-
-		/** The shape palette used to encode values (may be null). */		
-		public function get shapePalette():ShapePalette { return _shapes; }
-		public function set shapePalette(sp:ShapePalette):void { _shapes = sp; }
-
-		/** The size palette used to encode values (may be null). */		
-		public function get sizePalette():SizePalette { return _sizes; }
-		public function set sizePalette(sp:SizePalette):void { _sizes = sp; }
-		
-		/** Flag indicating the desired orientation of this legend. */
-		public function get orientation():int { return _orient; }
-		public function set orientation(o:int):void { _orient = o; }
-
-		/** Margin spacing value. */		
-		public function get margin():Number { return _margin; }
-		public function set margin(m:Number):void { _margin = m; }
-
-		/** TextFormat (font, size, style) of legend item labels. */		
-		public function get labelTextFormat():TextFormat { return _labelTextFormat; }
-		public function set labelTextFormat(f:TextFormat):void {
-			_labelTextFormat = f; updateItems();
-		}
-
-		/** Label formatting string for legend items. */		
-		public function get labelFormat():String {
-			return _labelFormat==null ? null 
-					: _labelFormat.substring(3, _labelFormat.length-1);
-		}
-		public function set labelFormat(fmt:String):void {
-			_labelFormat = "{0:"+fmt+"}"; updateItems();
-		}
-		
-		// -- Initialization --------------------------------------------------
-		
-		/**
-		 * Creates a new Legend for the given data field.
-		 * @param dataField the data field to describe with the legend
-		 * @param vis the visualization corresponding to this legend
-		 * @param scale the scale value used to map the data field to visual
-		 *  variables
-		 */
-		public function Legend(dataField:String, scale:Scale=null,
-			colors:ColorPalette=null, shapes:ShapePalette=null,
-			sizes:SizePalette=null)
-		{
-			_dataField = dataField;
-			this.scale = scale;
-			addChild(_border = new RectSprite(0,0,0,0,13,13));
-			addChild(_title = new TextSprite());
-			addChild(_items = new Sprite());
-			
-			_colors = colors;
-			_shapes = shapes;
-			_sizes = sizes;
-			
-			_title.textField.defaultTextFormat =
-				new TextFormat("Helvetica,Arial",12,null,true);
-			
-			update();
-		}
-		
-		// -- Updates ---------------------------------------------------------
-		
-		/**
-		 * Update the legend, recomputing filtering and layout of items.
-		 * @param trans a transitioner for value updates
-		 * @return the input transitioner
-		 */
-		public function update(trans:Transitioner=null) : Transitioner
-		{
-			var _t:Transitioner = trans!=null ? trans : Transitioner.DEFAULT;
-			filter(_t);
-			if (_discrete) updateItems(); // TEMP
-			layout(_t);
-			return trans;
-		}
-		
-		// -- Filter ----------------------------------------------------------
-		
-		/**
-		 * Performs filtering, determining the items contained in the legend.
-		 * @param trans a transitioner for value updates
-		 */
-		protected function filter(trans:Transitioner) : void
-		{
-			// first, remove all items
-			while (_items.numChildren > 0) {
-				_items.removeChildAt(_items.numChildren-1);
-			}
-			
-			var item:LegendItem;
-			
-			if (_discrete) {
-				var vals:Array = _scale.values(1000000);
-				for (var i:uint=0; i<vals.length; ++i) {
-					var f:Number = _scale.interpolate(vals[i]);
-					if (true) {
-						item = new LegendItem(
-							_scale.label(vals[i]),
-							_colors==null ? _defaultColor : _colors.getColor(f),
-							_shapes==null ? null : _shapes.getShape(i),
-							_sizes==null ? 1 : _sizes.getSize(f)
-						);
-						item.value = vals[i];
-						_items.addChild(item);
-					}
-				}
-			} else {
-				_items.addChild(new LegendRange(_dataField, _colors, _scale));
-			}
-		}
-		
-		// -- Layout ----------------------------------------------------------
-		
-		/**
-		 * Performs layout, setting the position for all items in the legend.
-		 * @param trans a transitioner for value updates
-		 */
-		protected function layout(trans:Transitioner) : void
-		{
-			var vert:Boolean = _orient==TOP_TO_BOTTOM || _orient==BOTTOM_TO_TOP;
-			var o:Object;
-			var b:Rectangle = layoutBounds;
-			var x:Number = 0, y:Number = 0, th:Number = 0;
-			
-			// position the legend
-			o = trans.$(this);
-			o.x = b.left;
-			o.y = b.top;
-			
-			// layout the title
-			if (_title.text != null && _title.text.length > 0) {
-				trans.$(_title).x = _margin;
-				trans.$(_title).alpha = 1;
-				y += (th = _title.height);
-			} else {
-				trans.$(_title).alpha = 0;
-			}
-			
-			// layout item container
-			o = trans.$(_items);
-			o.x = x;
-			o.y = y;
-			
-			// layout items
-			if (_discrete) {
-				layoutItemsDiscrete(trans);
-			} else {
-				layoutItemsContinuous(trans);
-			}
-			
-			x = x + (vert ? b.width : Math.min(_iw, b.width));
-			y = y + (vert ? Math.min(_ih, b.height) : _ih);
-			
-			// size the border
-			o = trans.$(_border);
-			o.w = x;
-			o.h = y;
-			if (trans.immediate) _border.render();
-			
-			// create clipping panel
-			trans.$(items).scrollRect =
-				new Rectangle(0, 0, 1+x, 1+y-th);
-		}
-		
-		// -- Legend Items ----------------------------------------------------
-		
-		/**
-		 * Layout helper for positioning discrete legend items.
-		 * @param trans a transitioner for value updates
-		 */
-		protected function layoutItemsDiscrete(trans:Transitioner):void
-		{
-			var vert:Boolean = _orient==TOP_TO_BOTTOM || _orient==BOTTOM_TO_TOP;
-			var x:Number = 0;
-			var y:Number = 0;
-			var item:LegendItem;
-			var o:Object;
-			var b:Rectangle = layoutBounds;
-			
-			_iw = _ih = 0;
-			for (var i:uint=0; i<_items.numChildren; ++i) {
-				// layout the item
-				item = _items.getChildAt(i) as LegendItem;
-				o = trans.$(item);
-				o.x = x;
-				o.y = y;
-				o.w = vert ? b.width : item.innerWidth;
-				
-				// increment spacing
-				if (vert) {
-					y += item.innerHeight;
-					_iw = Math.max(_iw, item.innerWidth);
-				}
-				else {
-					x += item.innerWidth;
-					_ih = Math.max(_ih, item.innerHeight);
-				}
-			}
-			_iw = vert ? _iw : x;
-			_ih = vert ? y : _ih;
-		}
-		
-		/**
-		 * Layout helper for positioning a continous legend range.
-		 * @param trans a transitioner for value updates
-		 */
-		protected function layoutItemsContinuous(trans:Transitioner):void
-		{
-			var lr:LegendRange = _items.getChildAt(0) as LegendRange;
-			_iw = lr.w = layoutBounds.width;
-			lr.updateLabels();
-			_ih = lr.height + lr.margin;
-		}
-		
-		/**
-		 * Updates an individual legend item. Currently only the text format
-		 * is updated.
-		 * @param item the legend item to update
-		 */
-		protected function updateItem(item:LegendItem) : void
-		{
-			item.label.setTextFormat(_labelTextFormat);
-			/*
-			label.text = _labelFormat==null ? label.value.toString()
-					   : Strings.format(_labelFormat, label.value);
-			*/
-		}
-		
-		/**
-		 * Updates all individual legend items.
-		 */
-		protected function updateItems() : void
-		{
-			for (var i:uint = 0; i<_items.numChildren; ++i) {
-				updateItem(_items.getChildAt(i) as LegendItem);
-			}
-		}
-		
-		// -- Static Constructor ----------------------------------------------
-		
-		/**
-		 * Generates a Legend from a Visualization instance by analyzing the
-		 * visualization operator chain.
-		 * @param field the data field for which to create the legend
-		 * @param vis the visualization to analyze
-		 * @return a generated legend, or null if the data field is not
-		 *  visually encoded.
-		 */
-		public static function fromVis(field:String, vis:Visualization):Legend
-		{
-			var colors:ColorPalette;
-			var sizes:SizePalette;
-			var shapes:ShapePalette;
-			var scale:Scale;
-			
-			for (var i:int=0; i<vis.operators.length; ++i) {
-				var op:IOperator = vis.operators[i];
-				if (op is ColorEncoder) {
-					colors = ColorEncoder(op).colors;
-					scale = Encoder(op).scale;
-				} else if (op is SizeEncoder) {
-					sizes = SizeEncoder(op).sizes;
-					scale = Encoder(op).scale;
-				} else if (op is ShapeEncoder) {
-					shapes = ShapeEncoder(op).shapes;
-					scale = Encoder(op).scale;
-				}
-			}
-			
-			if (scale != null) {
-				return new Legend(field, scale, colors, shapes, sizes);
-			} else {
-				return null;
-			}
-		}
-		
-	} // end of class Legend
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/legend/LegendItem.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/legend/LegendItem.as
deleted file mode 100644
index 5bf5e73faa..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/legend/LegendItem.as
+++ /dev/null
@@ -1,149 +0,0 @@
-package flare.vis.legend
-{
-	import flare.display.DirtySprite;
-	import flare.display.RectSprite;
-	import flash.display.Shape;
-	import flare.display.TextSprite;
-	import flash.display.Graphics;
-	import flare.vis.util.graphics.Shapes;
-	import flash.display.Sprite;
-
-	/**
-	 * An item in a discrete legend consisting of a label and
-	 * an icon indicating color, shape, and/or size.
-	 */
-	public class LegendItem extends RectSprite
-	{
-		private var _value:Object;
-		
-		private var _icon:Shape;
-		private var _iconLineWidth:Number = 2;
-		private var _label:TextSprite;
-		private var _text:String;
-		
-		private var _iconSize:Number = 12;
-		private var _margin:Number = 5;
-		
-		private var _shape:Function;
-		private var _color:uint;
-		private var _isize:Number; // should be a value between 0 and 1
-		
-		private var _selected:Boolean = false;
-		private var _backgroundColor:uint = 0xffffff;
-		
-		// -- Properties ------------------------------------------------------
-		
-		/** The data value represented by this legend item. */
-		public function get value():Object { return _value; }
-		public function set value(v:Object):void { _value = v; }
-		
-		/** Shape presenting this legend item's icon. */
-		public function get icon():Shape { return _icon; }
-		/** TextSprite presenting this legend item's label. */
-		public function get label():TextSprite { return _label; }
-		
-		/** The label text. */
-		public function get text():String { return _text; }
-		public function set text(t:String):void {
-			if (t != _text) { _text = t; _label.text = t; dirty(); }
-		}
-		
-		/** Line width to use within the icon. */
-		public function get iconLineWidth():Number { return _iconLineWidth; }
-		public function set iconLineWidth(s:Number):void {
-			if (s != _iconLineWidth) {
-				_iconLineWidth = s; _h = innerHeight; dirty();
-			}
-		}
-		
-		/** Size parameter for icon drawing. */
-		public function get iconSize():Number { return _iconSize; }
-		public function set iconSize(s:Number):void {
-			if (s != _iconSize) {
-				_iconSize = s; _h = innerHeight; dirty();
-			}
-		}
-		
-		/** Margin value for padding within the legend item. */
-		public function get margin():Number { return _margin; }
-		public function set margin(m:Number):void {
-			if (m != _margin) {
-				_margin = m; _h = innerHeight; dirty();
-			}
-		}
-		
-		/** The inner width of this legend item. */
-		public function get innerWidth():Number {
-			return 2*_margin + _iconSize + 
-				(_label.text.length>0 ? 2*_margin + _label.width : 0);
-		}
-		/** The inner height of this legend item. */
-		public function get innerHeight():Number {
-			return 2*_margin + _iconSize; // _label.height
-		}
-		
-		/** Flag indicating if this legend item has been selected. */
-		public function get selected():Boolean { return _selected; }
-		public function set selected(b:Boolean):void { _selected = b; }
-		
-		// -- Methods ---------------------------------------------------------
-		
-		/**
-		 * Creates a new LegendItem.
-		 * @param text the label text
-		 * @param color the color of the label icon
-		 * @param shape a shape drawing function for the label icon
-		 * @param iconScale a size parameter for drawing the label icon
-		 */
-		public function LegendItem(text:String=null, color:uint=0xff000000,
-								   shape:Function=null, iconScale:Number = 1)
-		{
-			addChild(_icon = new Shape());
-			addChild(_label = new TextSprite(_text=text));
-			
-			// init background
-			super(0,0,0, 2*_margin + _iconSize, 13, 13);
-			lineColor = 0x00000000;
-			fillColor = 0x00ffffff;
-			
-			// init label
-			_label.verticalAnchor = TextSprite.MIDDLE;
-			_label.mouseEnabled = false;
-			
-			// init icon
-			_color = color;
-			_shape = shape;
-			_isize = iconScale;
-		}
-		
-		/** @inheritDoc */
-		public override function render():void
-		{			
-			// layout label
-			_label.x = 2*_margin + _iconSize;
-			_label.y = _margin + _iconSize / 2;
-			// TODO compute text abbrev as needed
-			
-			// layout icon
-			_icon.x = _margin + _iconSize/2;
-			_icon.y = _margin + _iconSize/2;
-			
-			// render icon
-			var size:Number = _iconSize * _isize/2;
-			var g:Graphics = _icon.graphics;
-			g.clear();
-			if (_shape != null) {
-				g.lineStyle(_iconLineWidth, _color, 1);
-				_shape(g, size);
-			} else {
-				g.beginFill(_color);
-				g.lineStyle(1, 0xcccccc);
-				Shapes.square(g, size);
-				g.endFill();
-			}
-			
-			super.render();
-		}
-		
-	} // end of class LegendItem
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/legend/LegendRange.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/legend/LegendRange.as
deleted file mode 100644
index 785b73dfc4..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/legend/LegendRange.as
+++ /dev/null
@@ -1,269 +0,0 @@
-package flare.vis.legend
-{
-	import flash.display.Sprite;
-	import flare.vis.scale.Scale;
-	import flare.vis.palette.ColorPalette;
-	import flare.display.DirtySprite;
-	import flash.display.Graphics;
-	import flare.util.Colors;
-	import flash.display.GradientType;
-	import flash.geom.Matrix;
-	import flash.display.Shape;
-	import flare.display.RectSprite;
-	import flare.display.TextSprite;
-	import flash.text.TextFormat;
-	import flare.vis.scale.IScaleMap;
-	import flash.geom.Rectangle;
-	import flare.vis.data.Data;
-	import flare.util.Stats;
-	import flare.util.Maths;
-
-	/**
-	 * A range in a continuous legend, consisting of a continuous
-	 * visual scale and value labels.
-	 */
-	public class LegendRange extends RectSprite implements IScaleMap
-	{
-		private var _dataField:String;
-		private var _scale:Scale;
-		private var _stats:Stats;
-		private var _palette:ColorPalette;
-		private var _matrix:Matrix = new Matrix();
-		private var _margin:Number = 5;
-		
-		private var _labels:Sprite;
-		private var _fmt:TextFormat;
-		
-		private var _range:Shape;
-		private var _rh:Number = 20;
-		private var _borderColor:uint = 0xcccccc;
-		
-		/** The data field described by this legend range. */
-		public function get dataField():String { return _dataField; }
-		
-		/** Sprite containing the range's labels. */
-		public function get labels():Sprite { return _labels; }
-		
-		/** Stats object describing the data range. */
-		public function get stats():Stats { return _stats; }
-		public function set stats(s:Stats):void { _stats = s; }
-		
-		/** TextFormat (font, size, style) of legend range labels. */
-		public function get labelTextFormat():TextFormat { return _fmt; }
-		public function set labelTextFormat(fmt:TextFormat):void {
-			_fmt = fmt; dirty();
-		}
-		
-		/** Margin value for padding within the legend item. */
-		public function get margin():Number { return _margin; }
-		public function set margin(m:Number):void {
-			_margin = m; dirty();
-		}
-		
-		/** The color of the legend range border. */
-		public function get borderColor():uint { return _borderColor; }
-		public function set borderColor(c:uint):void { _borderColor = c; }
-		
-		// --------------------------------------------------------------------
-		
-		/**
-		 * Creates a new LegendRange.
-		 * @param dataField the data field described by this range
-		 * @param palette the color palette for the data field
-		 * @param scale the Scale instance mapping the data field to a visual
-		 *  variable
-		 */
-		public function LegendRange(dataField:String, palette:ColorPalette, scale:Scale)
-		{
-			_dataField = dataField;
-			_palette = palette;
-			_scale = scale;
-			addChild(_range = new Shape());
-			addChild(_labels = new Sprite());
-			_range.cacheAsBitmap = true;
-		}
-		
-		// --------------------------------------------------------------------
-		// Lookup
-		
-		/** @inheritDoc */
-		public function get x1():Number { return _margin; }
-		/** @inheritDoc */
-		public function get x2():Number { return _w - _margin; }
-		/** @inheritDoc */
-		public function get y1():Number { return _margin; }
-		/** @inheritDoc */
-		public function get y2():Number { return _margin + _rh; }
-		
-		private var _bounds:Rectangle = new Rectangle();
-				
-		/**
-		 * Bounds for the visual range portion of this legend range.
-		 * @return the bounds of the range display
-		 */
-		public function get bounds():Rectangle {
-			_bounds.x = x1;
-			_bounds.y = y1;
-			_bounds.width = x2 - x1;
-			_bounds.height = y2 - y1;
-			return _bounds;
-		}
-		
-		/** @inheritDoc */
-		public function value(x:Number, y:Number, stayInBounds:Boolean=true):Object
-        {
-        	var f:Number = (x-_margin) / (_w - 2*_margin);
-        	// correct bounds
-        	if (stayInBounds) {
-        		if (f < 0) f = 0;
-        		if (f > 1) f = 1;
-        	}
-        	// lookup and return value
-        	return _scale.lookup(f);
-        }
-        
-        /** @inheritDoc */
-        public function X(val:Object):Number
-        {
-        	return x1 + _scale.interpolate(val) * (x2 - x1);	
-        }
-        
-        /** @inheritDoc */
-        public function Y(val:Object):Number
-        {
-        	return y1;
-        }
-		
-		// --------------------------------------------------------------------
-		// Layout and Render
-		
-		/**
-		 * Update the labels shown by this legend range.
-		 */
-		public function updateLabels():void
-		{
-			var pts:Array = _palette==null ? [0,1] : _palette.keyframes;
-			var n:int = pts.length;
-			
-			// filter for the needed number of labels
-			for (var i:int=_labels.numChildren; i<n; ++i) {
-				_labels.addChild(new TextSprite());
-			}
-			for (i=_labels.numChildren; --i>=n;) {
-				_labels.removeChildAt(i);
-			}
-			// update and layout the labels
-			for (i=0; i<n; ++i) {
-				var ts:TextSprite = TextSprite(_labels.getChildAt(i));
-				var val:Object = _scale.lookup(pts[i]);
-				// set format
-				if (_fmt != null) ts.setTextFormat(_fmt);
-				// set text
-				ts.text = _scale.label(val);
-				// set alignement
-				if (i==0) {
-					ts.horizontalAnchor = TextSprite.LEFT;
-				} else if (i==n-1) {
-					ts.horizontalAnchor = TextSprite.RIGHT;
-				} else {
-					ts.horizontalAnchor = TextSprite.CENTER;
-				}
-				// set position
-				ts.x = X(val);
-				ts.y = y2;
-				ts.render();
-			}
-			// adjust visibility based on overlap
-			// TODO
-		}
-		
-		/** @inheritDoc */
-		public override function render():void
-		{
-			updateLabels();
-			
-			var w:Number = _w - 2*_margin;
-			var h:Number = 20;
-			_range.x = _margin;
-			_range.y = _margin;
-			this.h = 2*margin + h + _labels.height;
-			
-			_range.graphics.clear();
-			
-			if (_palette != null) {
-				drawPalette(w, h);
-			} else if (_stats != null) {
-				drawHistogram(w, h);
-			}
-			
-			_range.graphics.lineStyle(0, _borderColor);
-			_range.graphics.drawRect(0, 0, w, h);
-		}
-		
-		/**
-		 * Draws a histogram of data values in the range dispay.
-		 * @param w the width of the range display
-		 * @param h the height of the range display
-		 */
-		protected function drawHistogram(w:Number, h:Number):void
-		{
-			var values:Array = _stats.values;
-			var iw:int = int(w/2);
-			var i:int, pw:int = w / iw, f:Number;
-			
-			var counts:Array = new Array(iw);
-			for (i=0; i<counts.length; ++i) counts[i] = 0;
-			
-			for (i=0; i<values.length; ++i) {
-				f = _scale.interpolate(values[i]);
-				var idx:int = int(Math.round(f*(iw-1)));
-				counts[idx]++;
-			}
-			
-			var max:Number = 0;
-			for (i=0; i<counts.length; ++i) {
-				if (counts[i] > max) max = counts[i];
-			}
-			max =  h / (1.1*max);
-			
-			var g:Graphics = _range.graphics;
-			var v:Number, x:Number;
-			for (i=0; i<iw; ++i) {
-				g.beginFill(0xcccccc, 1);
-				x = (i/iw) * w;
-				v = counts[i] * max;
-				g.drawRect(x,h,pw,-v);
-				g.endFill();
-			}
-		}
-		
-		/**
-		 * Draws a continuous color range in the range display.
-		 * @param w the width of the range display
-		 * @param h the height of the range display
-		 */
-		protected function drawPalette(w:Number, h:Number):void
-		{
-			// build gradient paint parameters
-			var N:int = _palette.keyframes.length;
-			var colors:Array = new Array(N);
-			var alphas:Array = new Array(N);
-			var ratios:Array = new Array(N);
-			for (var i:int=0; i<N; ++i) {
-				var c:uint = _palette.getColor(_palette.keyframes[i]);
-				colors[i] = 0x00ffffff & c;
-				alphas[i] = Colors.a(c) / 255;
-				ratios[i] = int(255 * _palette.keyframes[i]);
-			}
-			_matrix.createGradientBox(w, h);
-			
-			// paint the color palette
-			var g:Graphics = _range.graphics;
-			g.beginGradientFill(GradientType.LINEAR,
-				colors, alphas, ratios, _matrix);
-			g.drawRect(0, 0, w, h);
-			g.endFill();
-		}
-		
-	} // end of class LegendRange
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/IOperator.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/IOperator.as
deleted file mode 100644
index d665398144..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/IOperator.as
+++ /dev/null
@@ -1,32 +0,0 @@
-package flare.vis.operator
-{
-	import flare.animate.Transitioner;
-	import flare.vis.Visualization;
-	import mx.core.IMXMLObject;
-	
-	/**
-	 * Interface for operators that perform processing tasks on the contents
-	 * of a Visualization. These tasks include layout, and color, shape, and
-	 * size encoding. Custom operators can be defined by implementing this
-	 * interface;
-	 */
-	public interface IOperator extends IMXMLObject
-	{
-		/** The visualization processed by this operator. */
-		function get visualization():Visualization;
-		function set visualization(v:Visualization):void;
-		
-		/**
-		 * Performs an operation over the contents of a visualization.
-		 * @param t a Transitioner instance for collecting value updates.
-		 */
-		function operate(t:Transitioner=null) : void;
-		
-		/**
-		 * Setup method invoked whenever this operator's visualization
-		 * property is set.
-		 */
-		function setup():void;
-		
-	} // end of interface IOperator
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/Operator.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/Operator.as
deleted file mode 100644
index 029a9c113a..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/Operator.as
+++ /dev/null
@@ -1,51 +0,0 @@
-package flare.vis.operator
-{
-	import flare.animate.Transitioner;
-	import flare.vis.Visualization;
-	
-	/**
-	 * Operators performs processing tasks on the contents of a Visualization.
-	 * These tasks include layout, and color, shape, and size encoding.
-	 * Custom operators can be defined by subclassing this class.
-	 */
-	public class Operator implements IOperator
-	{
-		// -- Properties ------------------------------------------------------
-		
-		private var _vis:Visualization;
-		
-		/** The visualization processed by this operator. */
-		public function get visualization():Visualization { return _vis; }
-		public function set visualization(v:Visualization):void {
-			_vis = v; setup();
-		}
-		
-		// -- Methods ---------------------------------------------------------
-		
-		/**
-		 * Performs an operation over the contents of a visualization.
-		 * @param t a Transitioner instance for collecting value updates.
-		 */
-		public function operate(t:Transitioner=null) : void {
-			// for sub-classes to implement	
-		}
-		
-		/**
-		 * Setup method invoked whenever this operator's visualization
-		 * property is set.
-		 */
-		public function setup():void
-		{
-			// for subclasses
-		}
-		
-		// -- MXML ------------------------------------------------------------
-		
-		/** @private */
-		public function initialized(document:Object, id:String):void
-		{
-			// do nothing
-		}
-		
-	} // end of class Operator
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/OperatorList.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/OperatorList.as
deleted file mode 100644
index 97317bae33..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/OperatorList.as
+++ /dev/null
@@ -1,172 +0,0 @@
-package flare.vis.operator
-{
-	import flare.animate.Transitioner;
-	import flare.util.Arrays;
-	import flare.vis.Visualization;
-	
-	import flash.utils.Proxy;
-	import flash.utils.flash_proxy;
-	
-	/**
-	 * An OperatorList maintains a sequential chain of operators that are
-	 * invoked one after the other. Operators can be added to an OperatorList
-	 * using the <code>add</code> method. Once added, operators can be
-	 * retrieved and set using their index in the lists, either with array
-	 * notation (<code>[]</code>) or with the <code>getOperatorAt</code> and
-	 * <code>setOperatorAt</code> methods.
-	 */
-	public class OperatorList extends Proxy implements IOperator
-	{
-		// -- Properties ------------------------------------------------------
-		
-		protected var _vis:Visualization;
-		protected var _list:Array = new Array();
-		
-		/** The visualization processed by this operator. */
-		public function get visualization():Visualization { return _vis; }
-		public function set visualization(v:Visualization):void
-		{
-			_vis = v; setup();
-			for each (var op:IOperator in _list) {
-				op.visualization = v;
-			}
-		}
-		
-		/** An array of the operators contained in the operator list. */
-		public function set list(ops:Array):void {
-			// first remove all current operators
-			while (_list.length > 0) {
-				removeOperatorAt(_list.length-1);
-			}
-			// then add the new operators
-			for each (var op:IOperator in ops) {
-				add(op);
-			}
-		}
-		
-		/** The number of operators in the list. */
-		public function get length():uint { return _list.length; }
-		
-		// --------------------------------------------------------------------
-		
-		/**
-		 * Creates a new OperatorList.
-		 * @param ops an ordered set of operators to include in the list.
-		 */
-		public function OperatorList(...ops) {
-			for each (var op:IOperator in ops) {
-				add(op);
-			}
-		}
-
-		/** @inheritDoc */
-		public function setup():void
-		{
-			for each (var op:IOperator in _list) {
-				op.setup();
-			}
-		}
-		
-		/**
-		 * Proxy method for retrieving operators from the internal array.
-		 */
-		flash_proxy override function getProperty(name:*):*
-		{
-    		return _list[name];
-    	}
-
-		/**
-		 * Proxy method for setting operators in the internal array.
-		 */
-    	flash_proxy override function setProperty(name:*, value:*):void
-    	{
-        	if (value is IOperator) {
-        		var op:IOperator = IOperator(value);
-        		_list[name] = op;
-        		op.visualization = this.visualization;
-        	} else {
-        		throw new ArgumentError("Input value must be an IOperator.");
-        	}
-    	}
-		
-		/**
-		 * Returns the operator at the specified position in the list
-		 * @param i the index into the operator list
-		 * @return the requested operator
-		 */
-		public function getOperatorAt(i:uint):IOperator
-		{
-			return _list[i];
-		}
-		
-		/**
-		 * Removes the operator at the specified position in the list
-		 * @param i the index into the operator list
-		 * @return the removed operator
-		 */
-		public function removeOperatorAt(i:uint):IOperator
-		{
-			return Arrays.removeAt(_list, i) as IOperator;
-		}
-		
-		/**
-		 * Set the operator at the specified position in the list
-		 * @param i the index into the operator list
-		 * @param op the operator to place in the list
-		 * @return the operator previously at the index
-		 */
-		public function setOperatorAt(i:uint, op:IOperator):IOperator
-		{
-			var old:IOperator = _list[i];
-			op.visualization = visualization;
-			_list[i] = op;
-			return old;
-		}
-		
-		/**
-		 * Adds an operator to the end of this list.
-		 * @param op the operator to add
-		 */
-		public function add(op:IOperator):void
-		{
-			op.visualization = visualization;
-			_list.push(op);
-		}
-		
-		/**
-		 * Removes an operator from this list.
-		 * @param op the operator to remove
-		 * @return true if the operator was found and removed, false otherwise
-		 */
-		public function remove(op:IOperator):Boolean
-		{
-			return Arrays.remove(_list, op) >= 0;
-		}
-		
-		/**
-		 * Removes all operators from this list.
-		 */
-		public function clear():void
-		{
-			Arrays.clear(_list);
-		}
-		
-		/** @inheritDoc */
-		public function operate(t:Transitioner=null):void
-		{
-			t = (t!=null ? t : Transitioner.DEFAULT);
-			for each (var op:IOperator in _list) {
-				op.operate(t);
-			}
-		}
-		
-		// -- MXML ------------------------------------------------------------
-		
-		/** @private */
-		public function initialized(document:Object, id:String):void
-		{
-			// do nothing
-		}
-		
-	} // end of class OperatorList
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/OperatorSequence.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/OperatorSequence.as
deleted file mode 100644
index 753e7e6d24..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/OperatorSequence.as
+++ /dev/null
@@ -1,131 +0,0 @@
-package flare.vis.operator
-{
-	import flare.animate.FunctionSequence;
-	import flare.animate.Transitioner;
-	import flare.util.Arrays;
-
-	/**
-	 * An OperatorSequence maintains a list of operators that are run in
-	 * sequence with an animated transition in between each. This is in
-	 * contrast to an OperatorList, which runs all the operators at once
-	 * and constructs a single animated transition across all sub-operators.
-	 * Instead, an OperatorSequence runs each operator separately, providing
-	 * each with a different Transitioner. The result is a multi-stage
-	 * animation, in which each operator in the seqeunce get its own
-	 * sub-transition.
-	 * 
-	 * <p>The <code>add</code> method is not supported by this class. Instead,
-	 * use the <code>addToSequence</code> method, which includes the operator
-	 * to add along with a duration value (in seconds) specifying the length
-	 * of the animated transition for the operator.</p>
-	 * 
-	 * <p>An OperatorSequence is implemented by creating a
-	 * <code>flare.animate.FunctionSequence</code> instance and using it to
-	 * construct the staged animation. The <code>FunctionSequence</code> is
-	 * then added to the <code>Transitioner</code> passed in to the
-	 * <code>operate</code> method for this class. As a result, the
-	 * <code>operate</code> methods for each operator contained in the
-	 * seqeunce will not be invoked until the top-level 
-	 * <code>Transitioner</code> is played.</p>
-	 * 
-	 * <p>However, if the input <code>Transitioner</code> is null or in
-	 * immediate mode, all the operators in the sequence will be run
-	 * immediately, exactly like a normal <code>OperatorList</code>.</p>
-	 */
-	public class OperatorSequence extends OperatorList
-	{
-		/** @private */
-		protected var _times:/*Number*/Array = [];
-		
-		/**
-		 * Creates a new OperatorSequence.
-		 */
-		public function OperatorSequence()
-		{
-			super();
-		}
-		
-		/**
-		 * Adds an operator and its timing information to this operator
-		 * sequence. The operator will be invoked with a transitioner
-		 * configured with the given duration (in seconds).
-		 * @param op the operator to add to the sequence
-		 * @param duration the duration of the animated transition to be
-		 *  used for results of the given operator.
-		 */
-		public function addToSequence(op:IOperator, duration:Number):void
-		{
-			super.add(op);
-			_times.push(duration);
-		}
-		
-		/**
-		 * Sets the duration in seconds for the animated transition for the
-		 * operator at the given index.
-		 * @param i the index at which to set the duration
-		 * @param duration the desired duration, in seconds
-		 * @return the previous duration value
-		 */
-		public function setDurationAt(i:uint, duration:Number):Number
-		{
-			var old:Number = _times[i];
-			_times[i] = duration;
-			return old;
-		}
-		
-		/**
-		 * This method is not supported by this class and will throw an error
-		 * if invoked.
-		 * @param op an input operator (ignored)
-		 */
-		public override function add(op:IOperator):void
-		{
-			throw new Error("Operation not supported. Use addToSequence instead.");
-		}
-		
-		/** @inheritDoc */
-		public override function remove(op:IOperator):Boolean
-		{
-			var idx:int = Arrays.remove(_list, op);
-			if (idx >= 0) {
-				_times.splice(idx, 1);
-				return true;
-			} else {
-				return false;
-			}
-		}
-		
-		/** @inheritDoc */
-		public override function removeOperatorAt(i:uint):IOperator
-		{
-			var op:IOperator = super.removeOperatorAt(i);
-			if (op != null) _times.splice(i, 1);
-			return op;
-		}
-		
-		/** @inheritDoc */
-		public override function operate(t:Transitioner=null):void
-		{
-			if (t==null || t.immediate) {
-				super.operate(t);
-			} else {
-				var fs:FunctionSequence = new FunctionSequence();
-				for (var i:int=0; i<_list.length; ++i) {
-					fs.addFunction(getFunction(_list[i]),
-					          new Transitioner(_times[i]));
-				}
-				t.add(fs);
-			}
-		}
-		
-		private function getFunction(op:IOperator):Function {
-			return function(t:Transitioner):void {
-				op.operate(t);
-				if (visualization.axes) {
-					visualization.axes.update(t);
-				}
-			}
-		}
-		
-	} // end of class OperatorSequence
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/OperatorSwitch.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/OperatorSwitch.as
deleted file mode 100644
index 0ba6e213dc..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/OperatorSwitch.as
+++ /dev/null
@@ -1,67 +0,0 @@
-package flare.vis.operator
-{
-	import flare.animate.Transitioner;
-	
-	/**
-	 * An OperatorSwitch maintains a list of sub-operators but only runs
-	 * one at a time, allowing different operator chains to be executed at
-	 * different times. Operators can be added to an OperatorSwitch
-	 * using the <code>add</code> method. Once added, operators can be
-	 * retrieved and set using their index in the list, either with array
-	 * notation (<code>[]</code>) or with the <code>getOperatorAt</code> and
-	 * <code>setOperatorAt</code> methods.
-	 * 
-	 * <p>The current sub-operator to run is determined by
-	 * the <tt>index</tt> property. This index can be set manually or can
-	 * be automatically determined upon each invocation by assigning a
-	 * custom function to the <tt>indexFunction</tt> property.</p>
-	 */
-	public class OperatorSwitch extends OperatorList
-	{
-		private var _cur:int = -1;
-		
-		/** The currently active index of the switch. Only the operator at this
-		 *  index is run when the <code>operate</code> method is called. */
-		public function get index():int { return _cur; }
-		public function set index(i:int):void { _cur = i; }
-		
-		/**
-		 * A function that determines the current index value of this
-		 * OperatorSwitch. This can be used to have the operator automatically
-		 * adjust which sub-operators to run. If this property is non-null,
-		 * the function will be invoked each time this OperatorSwitch is run
-		 * and the index property will be set with the resulting value,
-		 * overriding any previous index setting.
-		 * The index function should accept zero arguments and return an
-		 * integer that is a legal index value for this switch. If the
-		 * returned value is not a legal index value (i.e., it is not an
-		 * integer or is out of bounds) then no sub-operators will be
-		 * run.
-		 */
-		public var indexFunction:Function = null;
-		
-		// --------------------------------------------------------------------
-		
-		/**
-		 * Creates a new OperatorSwitch.
-		 * @param ops an ordered set of operators to include in the switch.
-		 */
-		public function OperatorSwitch(...ops) {
-			for each (var op:IOperator in ops) {
-				add(op);
-			}
-		}
-		
-		/** @inheritDoc */
-		public override function operate(t:Transitioner=null):void
-		{
-			t = (t!=null ? t : Transitioner.DEFAULT);
-			if (indexFunction != null) {
-				_cur = indexFunction();
-			}
-			if (_cur >= 0 && _cur < _list.length)
-				_list[_cur].operate(t);
-		}
-		
-	} // end of class OperatorSwitch
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/distortion/BifocalDistortion.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/distortion/BifocalDistortion.as
deleted file mode 100644
index e63db2b5ab..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/distortion/BifocalDistortion.as
+++ /dev/null
@@ -1,124 +0,0 @@
-package flare.vis.operator.distortion
-{
-	import flash.geom.Rectangle;
-	
-	/**
-	 * Computes a bifocal distortion of space, magnifying a focus region of space
-	 * and uniformly demagnifying the rest of the space. The affect is akin to
-	 * passing a magnifying glass over the data.
-	 * 
-	 * <p>
-	 * For more details on this form of transformation, see Y. K. Leung and 
-	 * M. D. Apperley, "A Review and Taxonomy of Distortion-Oriented Presentation
-	 * Techniques", in Transactions of Computer-Human Interaction (TOCHI),
-	 * 1(2): 126-160 (1994). Available online at
-	 * <a href="portal.acm.org/citation.cfm?id=180173&dl=ACM">
-	 * portal.acm.org/citation.cfm?id=180173&dl=ACM</a>.
-	 * </p>
-	 */
-	public class BifocalDistortion extends Distortion
-	{
-		private var _rx:Number;
-		private var _mx:Number;
-		private var _ry:Number;
-		private var _my:Number;
-		
-		/**
-	     * <p>Create a new BifocalDistortion with the specified range and 
-	     * magnification along both axes.</p>
-	     * 
-	     * <p><strong>NOTE:</strong>if the range value times the magnification
-	     * value is greater than 1, the resulting distortion can exceed the
-	     * display bounds.</p>
-	     * 
-	     * @param xrange the range around the focus that should be magnified along
-	     *  the x direction. This specifies the horizontal size of the magnified 
-	     *  focus region, and should be a value between 0 and 1, 0 indicating no
-	     *  focus region and 1 indicating the whole display.
-	     * @param xmag how much magnification along the x direction should be used
-	     *  in the focal area
-	     * @param yrange the range around the focus that should be magnified along
-	     *  the y direction. This specifies the vertical size of the magnified 
-	     *  focus region, and should be a value between 0 and 1, 0 indicating no
-	     *  focus region and 1 indicating the whole display.
-	     * @param ymag how much magnification along the y direction should be used
-	     *  in the focal area
-	     */
-		public function BifocalDistortion(xRange:Number=0.1, xMagnify:Number=3,
-			yRange:Number=0.1, yMagnify:Number=3)
-		{
-			_rx = xRange;
-	        _mx = xMagnify;
-	        _ry = yRange;
-	        _my = yMagnify;
-	        _distortX = !(_rx == 0 || _mx == 1.0);
-	        _distortY = !(_ry == 0 || _my == 1.0);
-		}
-		
-		/** @inheritDoc */
-		protected override function xDistort(x:Number):Number
-		{
-			return bifocal(x, layoutAnchor.x, _rx, _mx, _b.left, _b.right);	
-		}
-		
-		/** @inheritDoc */
-		protected override function yDistort(y:Number):Number
-		{
-			return bifocal(y, layoutAnchor.y, _ry, _my, _b.top, _b.bottom);	
-		}
-		
-		/** @inheritDoc */
-		protected override function sizeDistort(bb:Rectangle, x:Number, y:Number):Number
-		{
-			var xmag:Boolean = false, ymag:Boolean = false;
-			var m:Number, c:Number, a:Number, min:Number, max:Number;
-        
-	        if (_distortX) {
-	            c = (bb.left+bb.right)/2;
-	            a = layoutAnchor.x;
-	            min = _b.left;
-	            max = _b.right;
-	            m = c<a ? a-min : max-a;
-	            if (m == 0) m = max-min;
-	            xmag = (Math.abs(c-a) <= _rx*m )
-	        }
-	        
-	        if (_distortY) {
-	            c = (bb.top+bb.bottom)/2;
-	            a = layoutAnchor.y;
-	            min = _b.top;
-	            max = _b.bottom;
-	            m = c<a ? a-min : max-a;
-	            if (m == 0) m = max-min;
-	            ymag = (Math.abs(c-a) <= _ry*m);
-	        }
-	        
-	        if (xmag && !_distortY) {
-	            return _mx;
-	        } else if (ymag && !_distortX) {
-	            return _my;
-	        } else if (xmag && ymag) {
-	            return Math.min(_mx, _my);
-	        } else {
-	            return Math.min((1-_rx*_mx)/(1-_rx), (1-_ry*_my)/(1-_ry));
-	        }
-		}
-		
-		private function bifocal(x:Number, a:Number, r:Number, 
-                           mag:Number, min:Number, max:Number):Number
-	    {
-	    	var m:Number, v:Number, s:Number, bx:Number;
-	        m = (x<a ? a-min : max-a);
-	        if ( m == 0 ) m = max-min;
-	        v = x - a, s = m*r;
-	        if ( Math.abs(v) <= s ) {  // in focus
-	            return v*mag + a;
-	        } else {                   // out of focus
-	            bx = r*mag;
-	            x = ((Math.abs(v)-s) / m) * ((1-bx)/(1-r));
-	            return (v<0?-1:1)*m*(x + bx) + a;
-	        }
-	    }
-		
-	} // end of class BifocalDistortion
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/distortion/Distortion.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/distortion/Distortion.as
deleted file mode 100644
index 8f8451cb33..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/distortion/Distortion.as
+++ /dev/null
@@ -1,233 +0,0 @@
-package flare.vis.operator.distortion
-{
-	import flare.animate.Transitioner;
-	import flare.vis.axis.Axis;
-	import flare.vis.axis.CartesianAxes;
-	import flare.vis.data.Data;
-	import flare.vis.data.DataSprite;
-	import flare.vis.events.VisualizationEvent;
-	import flare.vis.operator.layout.Layout;
-	
-	import flash.display.Sprite;
-	import flash.geom.Point;
-	import flash.geom.Rectangle;
-	
-	/**
-	 * Base class for distortion operators that adjust the position and size
-	 * of visual objects in a visualization.
-	 */
-	public class Distortion extends Layout
-	{
-		/** Flag indicating is sizes should be distorted. */
-		protected var _distortSize:Boolean;
-		/** Flag indicating if x-coordinates should be distorted. */
-		protected var _distortX:Boolean;
-		/** Flag indicating if y-coordinates should be distorted. */
-		protected var _distortY:Boolean;
-		/** Flag indicating if axes should be distorted. */
-		protected var _distortAxes:Boolean;
-
-		/** A bounding rectangle for storing the layout bounds. */
-		protected var _b:Rectangle;
-		
-		private var _resetSize:Boolean = false;
-		private var _useSizeField:Boolean = false;
-		private var _anchorInBounds:Boolean = true;
-		private var _t:Transitioner;
-		
-		/** Flag indicating if x-coordinates should be distorted. */
-		public function get distortX():Boolean { return _distortX; }
-		public function set distortX(b:Boolean):void { _distortX = b; }
-		
-		/** Flag indicating if y-coordinates should be distorted. */
-		public function get distortY():Boolean { return _distortY; }
-		public function set distortY(b:Boolean):void { _distortY = b; }
-		
-		/** Flag indicating if sizes should be distorted. */
-		public function get distortSize():Boolean { return _distortSize; }
-		public function set distortSize(b:Boolean):void { _distortSize = b; }
-		
-		/** Flag indicating if axes should be distorted. */
-		public function get distortAxes():Boolean { return _distortAxes; }
-		public function set distortAxes(b:Boolean):void { _distortAxes = b; }
-		
-		/** Flag indicating if the <code>DataSprite.size</code> field should be
-		 *  distorted. If false (the default), the scaleX and scaleY properties
-		 *  are used instead. */
-		public function get useSizeField():Boolean { return _useSizeField; }
-		public function set useSizeField(b:Boolean):void { _useSizeField = b; }
-		
-		/** Flag indicating if the size or scale values should be reset to 1
-		 *  upon each invocation of the distortion. This avoids the need to
-		 *  manually reset the size values on each update. The default value
-		 *  is false. */
-		public function get resetSize():Boolean { return _resetSize; }
-		public function set resetSize(b:Boolean):void { _resetSize = b; }
-		
-		/** Flag indicating if distortion anchor points outside the layout
-		 *  bounds should be considered by the distortion. If true, external
-		 *  anchors will be mapped to nearest point on the border of the layout
-		 *  bounds. */
-		public function get anchorInBounds():Boolean { return _anchorInBounds; }
-		public function set anchorInBounds(b:Boolean):void { _anchorInBounds = b; }
-		
-		/** @inheritDoc */
-		public override function set layoutAnchor(p:Point):void {
-			if (p != null && _anchorInBounds) {
-        		var b:Rectangle = layoutBounds, x:Number, y:Number;
-        		x = (p.x < b.left ? b.left : (p.x > b.right ? b.right : p.x));
-        		y = (p.y < b.top ? b.top : (p.y > b.bottom ? b.bottom : p.y));
-        		p = new Point(x, y);
-			}
-			super.layoutAnchor = p;
-		}
-		
-		// --------------------------------------------------------------------
-		
-		/**
-		 * Creates a new Distortion.
-		 * @param distortX Flag indicating if x-coordinates should be distorted
-		 * @param distortY Flag indicating if y-coordinates should be distorted
-		 * @param distortSize Flag indicating is sizes should be distorted
-		 */		
-		public function Distortion(distortX:Boolean=true, distortY:Boolean=true,
-			distortSize:Boolean=true, distortAxes:Boolean=true)
-		{
-			this.distortX = distortX;
-			this.distortY = distortY;
-			this.distortSize = distortSize;
-			this.distortAxes = distortAxes;
-		}
-		
-		/** @inheritDoc */
-		public override function operate(t:Transitioner=null):void
-		{
-			_t = (t!=null ? t : Transitioner.DEFAULT);
-			_b = layoutBounds;
-			visualization.data.visit(distort, Data.NODES);
-			_t = null;
-			
-			if (_distortAxes && visualization.xyAxes)
-				visualization.addEventListener(
-					VisualizationEvent.UPDATE, axesDistort);
-		}
-		
-		/**
-		 * Distortion method for processing a DataSprite.
-		 * @param d a DataSprite to distort
-		 */
-		protected function distort(d:DataSprite):void
-		{
-			var o:Object = _t.$(d), ss:Number;
-			if (_resetSize) {
-				if (_useSizeField) { o.size = 1; }
-				else { o.scaleX = 1; o.scaleY = 1; }
-			}
-			var bb:Rectangle = d.getBounds(d.parent);
-			
-			if (_distortX) o.x = xDistort(o.x);
-			if (_distortY) o.y = yDistort(o.y);
-			if (_distortSize) {
-				ss = sizeDistort(bb, o.x, o.y);
-				if (_useSizeField) {
-					o.size *= ss;
-				} else {
-					o.scaleX *= ss;
-					o.scaleY *= ss;
-				}
-			}
-		}
-		
-		/**
-		 * Compute a distorted x-coordinate.
-		 * @param x the initial x-coordinate
-		 * @return the distorted s-coordinate
-		 */
-		protected function xDistort(x:Number):Number
-		{
-			// for sub-classes
-			return x;
-		}
-		
-		/**
-		 * Compute a distorted y-coordinate.
-		 * @param y the initial y-coordinate
-		 * @return the distorted y-coordinate
-		 */
-		protected function yDistort(y:Number):Number
-		{
-			// for sub-classes
-			return y;
-		}
-		
-		/**
-		 * Compute a distorted size value.
-		 * @param bb an object's bounding box
-		 * @param x the initial x-coordinate
-		 * @param y the initial y-coordinate
-		 * @return the distorted size value
-		 */
-		protected function sizeDistort(bb:Rectangle, x:Number, y:Number):Number
-		{
-			// for sub-classes
-			return 1;
-		}
-		
-		/**
-		 * Performs distortion of Cartesian axes. As axis layout is recomputed
-		 * <em>after</em> the operators have run, we must distort the axes in
-		 * a separate step. This is accomplished by adding an update listener
-		 * on the visualization that invokes the axis distortion after the
-		 * axis layout has completed. This method is registered as the
-		 * listener callback.
-		 * @param evt the visualization update event
-		 */
-		protected function axesDistort(evt:VisualizationEvent):void
-		{
-			_t = evt.transitioner;
-			_t = (_t==null ? Transitioner.DEFAULT : _t);
-			
-			var axes:CartesianAxes = visualization.xyAxes;
-			if (axes != null) {
-				distortAxis(axes.xAxis, true, false);
-				distortAxis(axes.yAxis, false, true);
-			}
-			visualization.removeEventListener(
-				VisualizationEvent.UPDATE, axesDistort);
-				
-			_t = null;
-		}
-		
-		private function distortAxis(axis:Axis, xb:Boolean, yb:Boolean):void
-		{
-			var i:int, o:Object;
-			
-			// distort the axis labels
-			var labels:Sprite = axis.labels;
-			for (i=0; i<labels.numChildren; ++i) {
-				o = _t.$(labels.getChildAt(i));
-				if (xb && _distortX) {
-					o.x = xDistort(o.x);
-				}
-				if (yb && _distortY) {
-					o.y = yDistort(o.y);
-				}
-			}
-			
-			// distort the axis gridlines
-			var glines:Sprite = axis.gridLines;
-			for (i=0; i<glines.numChildren; ++i) {
-				o = _t.$(glines.getChildAt(i));
-				if (xb && _distortX) {
-					o.x1 = xDistort(o.x1);
-					o.x2 = xDistort(o.x2);
-				}
-				if (yb && _distortY) {
-					o.y1 = yDistort(o.y1);
-					o.y2 = yDistort(o.y2);
-				}
-			}
-		}
-		
-	} // end of class Distortion
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/distortion/FisheyeDistortion.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/distortion/FisheyeDistortion.as
deleted file mode 100644
index aec9bf6fea..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/distortion/FisheyeDistortion.as
+++ /dev/null
@@ -1,98 +0,0 @@
-package flare.vis.operator.distortion
-{
-	import flash.geom.Rectangle;
-	
-	/**
-	 * Computes a graphical fisheye distortion of a graph view. This distortion 
-	 * allocates more space to items near the layout anchor and less space to 
-	 * items further away, magnifying space near the anchor and demagnifying 
-	 * distant space in a continuous fashion.
-	 * 
-	 * <p>
-	 * For more details on this form of transformation, see Manojit Sarkar and 
-	 * Marc H. Brown, "Graphical Fisheye Views of Graphs", in Proceedings of 
-	 * CHI'92, Human Factors in Computing Systems, p. 83-91, 1992. Available
-	 * online at <a href="http://citeseer.ist.psu.edu/sarkar92graphical.html">
-	 * http://citeseer.ist.psu.edu/sarkar92graphical.html</a>. 
-	 * </p>
-	 */
-	public class FisheyeDistortion extends Distortion
-	{
-		private var _dx:Number; // x distortion factor
-		private var _dy:Number; // y distortion factor
-    	private var _ds:Number; // size distortion factor
-		
-		// --------------------------------------------------------------------
-		
-		/**
-	     * Create a new FisheyeDistortion with the given distortion factors
-	     * along the x and y directions.
-	     * @param dx the distortion factor along the x axis (0 for none)
-	     * @param dy the distortion factor along the y axis (0 for none)
-	     * @param ds the distortion factor to use for sizes (0 for none)
-	     */
-		public function FisheyeDistortion(dx:Number=4, dy:Number=4, ds:Number=3) {
-			_dx = dx;
-			_dy = dy;
-			_ds = ds;
-			super(_dx>0, _dy>0, _ds>0);
-		}
-		
-		/** @inheritDoc */
-		protected override function xDistort(x:Number):Number
-		{
-			return fisheye(x, layoutAnchor.x, _dx, _b.left, _b.right);
-		}
-		
-		/** @inheritDoc */
-		protected override function yDistort(y:Number):Number
-		{
-			return fisheye(y, layoutAnchor.y, _dy, _b.top, _b.bottom);
-		}
-		
-		/** @inheritDoc */
-		protected override function sizeDistort(bb:Rectangle, x:Number, y:Number):Number
-		{
-			if (!_distortX && !_distortY) return 1;
-			var fx:Number=1, fy:Number=1;
-			var a:Number, min:Number, max:Number, v:Number;
-			
-	        if (_distortX) {
-	            a = layoutAnchor.x;
-	            min = bb.left;
-	            max = bb.right;
-	            v = Math.abs(min-a) > Math.abs(max-a) ? min : max;
-	            if (v < _b.left || v > _b.right) v = (v==min ? max : min);
-	            fx = fisheye(v, a, _dx, _b.left, _b.right);
-	            fx = Math.abs(x-fx) / (max - min);
-	        }
-	
-	        if (_distortY) {
-	        	a = layoutAnchor.y;
-	        	min = bb.top;
-	        	max = bb.bottom;
-	        	v = Math.abs(min-a) > Math.abs(max-a) ? min : max;
-	        	if (v < _b.top || v > _b.bottom) v = (v==min ? max : min);
-	            fy = fisheye(v, a, _dy, _b.top, _b.bottom);
-	            fy = Math.abs(y-fy) / (max - min);
-	        }
-	        
-	        var sf:Number = (!_distortY ? fx : (!_distortX ? fy : Math.min(fx,fy)));
-	        return (!isFinite(sf) || isNaN(sf)) ? 1 : _ds * sf;
-		}
-		
-		private function fisheye(x:Number, a:Number, d:Number, 
-			min:Number, max:Number) : Number
-		{
-	        if (d == 0) return x;
-	        
-	        var left:Boolean = x<a;
-	        var v:Number, m:Number = (left ? a-min : max-a);
-	        if ( m == 0 ) m = max-min;
-	        v = Math.abs(x - a) / m;
-	        v = (d+1)/(d+(1/v));
-	        return (left?-1:1)*m*v + a;
-	    }
-		
-	} // end of class FisheyeDistortion
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/encoder/ColorEncoder.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/encoder/ColorEncoder.as
deleted file mode 100644
index f96c234990..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/encoder/ColorEncoder.as
+++ /dev/null
@@ -1,69 +0,0 @@
-package flare.vis.operator.encoder
-{
-	import flare.vis.palette.ColorPalette;
-	import flare.vis.palette.Palette;
-	import flare.vis.scale.OrdinalScale;
-	import flare.vis.scale.ScaleType;
-	
-	/**
-	 * Encodes a data field into color values, using a scale transform and
-	 * color palette.
-	 */
-	public class ColorEncoder extends Encoder
-	{
-		private var _palette:ColorPalette;
-		private var _ordinal:OrdinalScale = null;
-		
-		/** @inheritDoc */
-		public override function get palette():Palette { return _palette; }
-		public override function set palette(p:Palette):void {
-			_palette = p as ColorPalette;
-		}
-		/** The palette as a ColorPalette instance. */
-		public function get colors():ColorPalette { return _palette; }
-		
-		// --------------------------------------------------------------------
-		
-		/**
-		 * Creates a new ColorEncoder.
-		 * @param source the source property
-		 * @param which flag indicating which group of visual object to process
-		 * @param target the target property ("lineColor" by default)
-		 * @param palette the color palette to use. If null, a default color
-		 *  ramp will be used
-		 * @param scaleType the type of scale to use (LINEAR by default)
-		 * @param scaleParam a parameter for creating the scale (10 by default)
-		 */
-		public function ColorEncoder(source:String=null, which:int=1/*Data.NODES*/,
-			target:String="lineColor", scaleType:String=ScaleType.LINEAR,
-			scaleParam:Number=10, palette:ColorPalette=null)
-		{
-			super(source, target, which);
-			_scaleType = scaleType;
-			_scaleParam = scaleParam;
-			_palette = palette;
-		}
-		
-		/** @inheritDoc */
-		public override function setup():void
-		{
-			if (visualization==null) return;
-			super.setup();
-			_ordinal = _scale as OrdinalScale;
-			if (_palette==null) {
-				_palette = ColorPalette.getDefaultPalette(_scale);
-			}
-		}
-		
-		/** @inheritDoc */
-		protected override function encode(val:Object):*
-		{
-			if (_ordinal) {
-				return _palette.getColorByIndex(_ordinal.index(val));
-			} else {
-				return _palette.getColor(_scale.interpolate(val));
-			}
-		}
-		
-	} // end of class ColorEncoder
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/encoder/Encoder.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/encoder/Encoder.as
deleted file mode 100644
index 0a16585ff9..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/encoder/Encoder.as
+++ /dev/null
@@ -1,133 +0,0 @@
-package flare.vis.operator.encoder
-{
-	import flare.vis.operator.Operator;
-	import flare.animate.Transitioner;
-	import flare.vis.data.Data;
-	import flare.vis.data.DataSprite;
-	import flare.util.Property;
-	import flare.vis.scale.Scale;
-	import flare.vis.palette.Palette;
-
-	/**
-	 * Base class for Operators that perform encoding of visual variables such
-	 * as color, shape, and size. All Encoders share a similar structure:
-	 * A source property (e.g., a data field) is mapped to a target property
-	 * (e.g., a visual variable) using a <tt>Scale</tt> instance to map
-	 * between values and a <tt>Palette</tt> instance to map scaled output
-	 * into visual variables such as color, shape, and size.
-	 */
-	public class Encoder extends Operator
-	{
-		/** Flag indicating which data group (NODES, EDGES, or ALL) should
-		 *  be processed by this encoder. */
-		protected var _which:int;
-		/** Boolean function indicating which items to process. */
-		protected var _filter:Function;
-		/** The source property. */
-		protected var _source:Property;
-		/** The target property. */
-		protected var _target:String;
-		/** A transitioner for collecting value updates. */
-		protected var _t:Transitioner;
-		
-		/** The scale used by the encoder. */
-		protected var _scale:Scale;
-		/** The scale type parameter. */
-		protected var _scaleType:String;
-		/** A parameter for the scale instance. */
-		protected var _scaleParam:Number;
-		/** Flag indicating if this encoder should initialize the scale. */
-		protected var _initScale:Boolean = true;
-		
-		/** Flag indicating which data group (NODES, EDGES, or ALL) should
-		 *  be processed by this encoder. */
-		public function get which():int { return _which; }
-		public function set which(w:int):void { _which = w; }
-		
-		/** Boolean function indicating which items to process. Only items
-		 *  for which this function return true will be considered by the
-		 *  Encoder. If the function is null, all items will be considered. */
-		public function get filter():Function { return _filter; }
-		public function set filter(f:Function):void { _filter = f; }
-		
-		/** The source property. */
-		public function get source():String { return _source.name; }
-		public function set source(f:String):void {
-			_source = Property.$(f); setup();
-		}
-		
-		/** The target property. */
-		public function get target():String { return _target; }
-		public function set target(f:String):void { _target = f; }
-		
-		/** The scale type parameter.
-		 *  @see flare.vis.scale.Scales */
-		public function get scaleType():String { return _scaleType; }
-		public function set scaleType(st:String):void { _scaleType = st; setup(); }
-		
-		/** A parameter for the scale instance. Used as input to the
-		 *  <code>flare.vis.scale.Scales.scale method. */
-		public function get scaleParam():Number { return _scaleParam; }
-		public function set scaleParam(p:Number):void { _scaleParam = p; setup(); }
-
-		/** The scale used by the encoder. */
-		public function get scale():Scale { return _scale; }
-		public function set scale(s:Scale):void {
-			_scale = s; _initScale = (_scale==null); setup();
-		}
-		
-		/** The palette used to map scale values to visual values. */
-		public function get palette():Palette { return null; }
-		public function set palette(p:Palette):void { }
-		
-		// --------------------------------------------------------------------
-		
-		/**
-		 * Creates a new Encoder.
-		 * @param source the source property
-		 * @param target the target property
-		 * @param which flag indicating which group of visual object to process
-		 */		
-		public function Encoder(source:String=null, target:String=null,
-							which:int=1/*Data.NODES*/, filter:Function=null)
-		{
-			_source = source==null ? null : Property.$(source);
-			_target = target;
-			_which = which;
-			_filter = filter;
-		}
-		
-		/** @inheritDoc */
-		public override function setup():void
-		{
-			if (visualization==null || !_initScale) return;
-			var data:Data = visualization.data;
-			_scale = data.scale(_source.name, _which, _scaleType, _scaleParam);
-		}
-		
-		/** @inheritDoc */
-		public override function operate(t:Transitioner=null):void
-		{
-			_t = (t!=null ? t : Transitioner.DEFAULT);
-			
-			if (visualization == null) return;
-			visualization.data.visit(function(d:DataSprite):void {
-				_t.$(d)[_target] = encode(_source.getValue(d));
-			}, _which, _filter);
-			
-			_t = null;
-		}
-		
-		/**
-		 * Computes an encoding for the input value.
-		 * @param val a data value to encode
-		 * @return the encoded visual value
-		 */
-		protected function encode(val:Object):*
-		{
-			// sub-classes can override this
-			return null;
-		}
-		
-	} // end of class Encoder
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/encoder/PropertyEncoder.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/encoder/PropertyEncoder.as
deleted file mode 100644
index d16b8bd488..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/encoder/PropertyEncoder.as
+++ /dev/null
@@ -1,84 +0,0 @@
-package flare.vis.operator.encoder
-{
-	import flare.animate.Transitioner;
-	import flare.vis.data.DataSprite;
-	import flare.vis.operator.Operator;
-
-	/**
-	 * A property encoder simply sets a group of properties to static
-	 * values for all data sprites. An input object determines which
-	 * properties to set and what their values are.
-	 * 
-	 * For example, a PropertyEncoder created with this call:
-	 * <code>new PropertyEncoder({size:1, lineColor:0xff0000ff{);</code>
-	 * will set the size to 1 and the line color to blue for all
-	 * data sprites processed by the encoder.
-	 */
-	public class PropertyEncoder extends Operator
-	{
-		/** Flag indicating which data group (NODES, EDGES, or ALL) should
-		 *  be processed by this encoder. */
-		protected var _which:int;
-		/** Boolean function indicating which items to process. */
-		protected var _filter:Function;
-		/** Flag indicating if property values should be set immediately. */
-		protected var _ignoreTrans:Boolean;
-		/** The properties to set on each invocation. */
-		protected var _values:Object;
-		/** A transitioner for collecting value updates. */
-		protected var _t:Transitioner;
-		
-		/** Flag indicating which data group (NODES, EDGES, or ALL) should
-		 *  be processed by this encoder. */
-		public function get which():int { return _which; }
-		public function set which(w:int):void { _which = w; }
-		
-		/** Boolean function indicating which items to process. Only items
-		 *  for which this function return true will be considered by the
-		 *  Encoder. If the function is null, all items will be considered. */
-		public function get filter():Function { return _filter; }
-		public function set filter(f:Function):void { _filter = f; }
-		
-		public function get ignoreTransitioner():Boolean { return _ignoreTrans; }
-		public function set ignoreTransitioner(b:Boolean):void { _ignoreTrans = b; }
-		
-		/** The properties to set on each invocation. */
-		public function get values():Object { return _values; }
-		public function set values(o:Object):void { _values = o; }
-		
-		// --------------------------------------------------------------------
-		
-		/**
-		 * Creates a new PropertyEncoder
-		 * @param values The properties to set on each invocation. The input
-		 *  should be an object with a set of name/value pairs.
-		 * @param which Flag indicating which data group (NODES, EDGES, or ALL)
-		 *  should be processed by this encoder.
-		 * @param filter a Boolean-valued function that takes a DataSprite as
-		 *  input and returns true if the sprite should be processed
-		 * @param ignoreTransitioner Flag indicating if values should be set
-		 *  immediately rather than being processed by any transitioners
-		 */		
-		public function PropertyEncoder(values:Object=null, which:int=1,
-			filter:Function=null, ignoreTransitioner:Boolean=false)
-		{
-			_values = values==null ? {} : values;
-			_which = which;
-			_filter = filter;
-			_ignoreTrans = ignoreTransitioner;
-		}
-		
-		/** @inheritDoc */
-		public override function operate(t:Transitioner=null):void
-		{
-			t = (t==null || _ignoreTrans ? Transitioner.DEFAULT : t);
-			if (_values == null) return;
-			
-			visualization.data.visit(function(d:DataSprite):void {
-				for (var p:String in _values)
-					t.setValue(d, p, _values[p]);
-			}, _which, _filter);
-		}
-		
-	} // end of class PropertyEncoder
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/encoder/ShapeEncoder.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/encoder/ShapeEncoder.as
deleted file mode 100644
index 7c742ed54d..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/encoder/ShapeEncoder.as
+++ /dev/null
@@ -1,63 +0,0 @@
-package flare.vis.operator.encoder
-{
-	import flare.vis.palette.Palette;
-	import flare.vis.palette.ShapePalette;
-	import flare.vis.scale.OrdinalScale;
-	import flare.vis.scale.Scale;
-	import flare.vis.scale.ScaleType;
-	
-	/**
-	 * Encodes a data field into shape values, using an ordinal scale.
-	 * Shape values are integer indices that map into a shape palette, which
-	 * provides drawing routines for shapes. See the
-	 * <code>flare.palette.ShapePalette</code> and 
-	 * <code>flare.data.render.ShapeRenderer</code> classes for more.
-	 */
-	public class ShapeEncoder extends Encoder
-	{
-		private var _palette:ShapePalette;
-		
-		/** @inheritDoc */
-		public override function get palette():Palette { return _palette; }
-		public override function set palette(p:Palette):void {
-			_palette = p as ShapePalette;
-		}
-		/** The palette as a ShapePalette instance. */
-		public function get shapes():ShapePalette { return _palette; }
-		public function set shapes(p:ShapePalette):void { _palette = p; }
-		
-		// --------------------------------------------------------------------
-		
-		/** @inheritDoc */
-		public override function set scaleType(st:String):void {
-			if (st != ScaleType.CATEGORIES)
-				throw new ArgumentError(
-					"Shape encoders only use the CATEGORIES scale type");
-		}
-		
-		/** @inheritDoc */
-		public override function set scale(s:Scale):void {
-			if (!(s is OrdinalScale))
-				throw new ArgumentError("Shape encoders only use OrdinalScales");
-		}
-		
-		/**
-		 * Creates a new ShapeEncoder.
-		 * @param source the source property
-		 * @param which flag indicating which group of visual object to process
-		 */
-		public function ShapeEncoder(field:String=null, which:int=1/*Data.NODES*/)
-		{
-			super(field, "shape", which);
-			_palette = ShapePalette.defaultPalette();
-			_scaleType = ScaleType.CATEGORIES;
-		}
-		
-		/** @inheritDoc */
-		protected override function encode(val:Object):*
-		{
-			return (_scale as OrdinalScale).index(val);
-		}
-		
-	} // end of class ShapeEncoder
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/encoder/SizeEncoder.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/encoder/SizeEncoder.as
deleted file mode 100644
index 43157b4b9e..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/encoder/SizeEncoder.as
+++ /dev/null
@@ -1,51 +0,0 @@
-package flare.vis.operator.encoder
-{
-	import flare.vis.data.Data;
-	import flare.vis.palette.Palette;
-	import flare.vis.palette.SizePalette;
-	import flare.vis.scale.ScaleType;
-	
-	/**
-	 * Encodes a data field into size values, using a scale transform and a
-	 * size palette to determines an item's scale. The target property of a
-	 * SizeEncoder is assumed to be the <code>DataSprite.size</code> property.
-	 */
-	public class SizeEncoder extends Encoder
-	{
-		private var _palette:SizePalette;
-		
-		/** @inheritDoc */
-		public override function get palette():Palette { return _palette; }
-		public override function set palette(p:Palette):void {
-			_palette = p as SizePalette;
-		}
-		/** The palette as a SizePalette instance. */
-		public function get sizes():SizePalette { return _palette; }
-		
-		// --------------------------------------------------------------------
-		
-		/**
-		 * Creates a new SizeEncoder.
-		 * @param source the source property
-		 * @param which flag indicating which group of visual object to process
-		 * @param scaleType the type of scale to use (QUANTILE by default)
-		 * @param scaleParam a parameter for creating the scale (5 by default)
-		 */
-		public function SizeEncoder(source:String=null, which:int=1/*Data.NODES*/,
-			scaleType:String=ScaleType.QUANTILE, scaleParam:Number=5)
-		{
-			super(source, "size", which);
-			_scaleType = scaleType;
-			_scaleParam = scaleParam;
-			_palette = new SizePalette();
-			_palette.is2D = (which != Data.EDGES);
-		}
-		
-		/** @inheritDoc */
-		protected override function encode(val:Object):*
-		{
-			return _palette.getSize(_scale.interpolate(val));
-		}
-		
-	} // end of class SizeEncoder
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/filter/FisheyeTreeFilter.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/filter/FisheyeTreeFilter.as
deleted file mode 100644
index 6566f714dd..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/filter/FisheyeTreeFilter.as
+++ /dev/null
@@ -1,154 +0,0 @@
-package flare.vis.operator.filter
-{
-	import flare.animate.Transitioner;
-	import flare.vis.data.Data;	
-	import flare.vis.data.DataSprite;
-	import flare.vis.data.EdgeSprite;
-	import flare.vis.data.NodeSprite;
-	import flare.vis.data.Tree;	
-	import flare.vis.operator.Operator;
-
-	/**
-	 * Filter operator that computes a fisheye degree-of-interest function over
-	 * a tree structure. Visibility and DOI (degree-of-interest) values are set
-	 * for the nodes and edges in the structure. This function includes a set
-	 * of focus nodes, and includes neighbors only in a limited window around
-	 * these foci. The size of this window is determined by this operator's
-	 * <code>distance</code> property. All ancestors of a focus up to the root
-	 * of the tree are considered foci as well. By convention, DOI values start
-	 * at zero for focus nodes, with decreasing negative numbers for each hop
-	 * away from a focus. The DOI values computed by this filter are stored in
-	 * the <code>DataSprite.props.doi</code> property.
-	 * 
-	 * <p>This form of filtering was described by George Furnas as early as 1981.
-	 * For more information about Furnas' fisheye view calculation and DOI values,
-	 * take a look at G.W. Furnas, "The FISHEYE View: A New Look at Structured 
-	 * Files," Bell Laboratories Tech. Report, Murray Hill, New Jersey, 1981. 
-	 * Available online at <a href="http://citeseer.nj.nec.com/furnas81fisheye.html">
-	 * http://citeseer.nj.nec.com/furnas81fisheye.html</a>.</p>
-	 */
-	public class FisheyeTreeFilter extends Operator
-	{
-		/** An array of focal NodeSprites. */
-		public var focusNodes:/*NodeSprite*/Array;
-		/** Graph distance within within which items wll be visible. */
-		public var distance:int;
-		
-		private var _divisor:Number;
-		private var _root:NodeSprite;
-		private var _t:Transitioner;
-		
-		/**
-		 * Creates a new FisheyeTreeFilter
-		 * @param focusNodes focusNodes an array of focal NodeSprites. Graph
-		 *  distance is measured as the minimum number of edge-hops to one of
-		 *  these nodes or their ancestors up to the root.
-		 * @param distance graph distance within which items will be visible
-		 */		
-		public function FisheyeTreeFilter(focusNodes:Array, distance:int=1) {
-			this.focusNodes = focusNodes;
-			this.distance = distance;
-		}
-		
-		/** @inheritDoc */
-		public override function operate(t:Transitioner=null):void
-		{
-			_t = (t==null ? Transitioner.DEFAULT : t);
-			var tree:Tree = visualization.tree;
-			_divisor = tree.nodes.size;
-        	_root = tree.root;
-        
-	        // mark the items
-	        visualization.data.visit(function(ds:DataSprite):void {
-	        	ds.props.doi = -Number.MAX_VALUE;
-	        }, Data.ALL);
-	        
-	        // compute the fisheye over nodes
-	        for each (var fn:NodeSprite in focusNodes) {
-	        	visitFocus(fn, null);
-	        }
-	        visitFocus(_root, null);
-	
-	        // mark unreached items
-	        visualization.data.visit(function(ds:DataSprite):void {
-	        	if (ds.props.doi == -Number.MAX_VALUE)
-	        		setVisibility(ds, false);
-	        }, Data.ALL);
-		}
-		
-		/**
-		 * Set the visibility of a data sprite.
-		 */
-		private function setVisibility(ds:DataSprite, visible:Boolean):void
-		{
-			var alpha:Number = visible ? 1 : 0;
-			var obj:Object = _t.$(ds);
-				
-			obj.alpha = alpha;
-			if (ds is NodeSprite)
-				(ds as NodeSprite).expanded = (ds.props.doi > -distance);
-			if (_t.immediate) {
-				ds.visible = visible;
-			} else {
-				obj.visible = visible;
-			}
-		}
-		
-		/**
-	     * Visit a focus node.
-	     */
-	    private function visitFocus(n:NodeSprite, c:NodeSprite):void
-	    {
-	        if (n.props.doi <= -1 ) {
-	            visit(n, c, 0, 0);
-	            if (distance > 0) visitDescendants(n, c);
-	            visitAncestors(n);
-	        }
-	    }
-	    
-	    /**
-	     * Visit a specific node and update its degree-of-interest.
-	     */
-	    private function visit(n:NodeSprite, c:NodeSprite, doi:int, ldist:int):void
-	    {
-	    	setVisibility(n, true);
-	        var localDOI:Number = -ldist / Math.min(1000.0, _divisor);
-	        n.props.doi = doi + localDOI;
-	        
-	        if (c != null) {
-	        	var e:EdgeSprite = c.parentEdge;
-	        	e.props.doi = c.props.doi;
-	        	setVisibility(e, true);
-	        }
-	    }
-	    
-	    /**
-	     * Visit tree ancestors and their other descendants.
-	     */
-	    private function visitAncestors(n:NodeSprite):void
-	    {
-	        if (n == _root) return;
-	        visitFocus(n.parentNode, n);
-	    }
-	    
-	    /**
-	     * Traverse tree descendents.
-	     */
-	    private function visitDescendants(p:NodeSprite, skip:NodeSprite):void
-	    {
-	    	var lidx:int = (skip == null ? 0 : skip.parentIndex);
-	        
-	        p.expanded = p.childDegree > 0;
-	        for (var i:int=0; i<p.childDegree; ++i) {
-	        	var c:NodeSprite = p.getChildNode(i);
-	        	if (c == skip) continue;
-	        	
-	        	var doi:int = int(p.props.doi - 1);
-	        	visit(c, c, doi, Math.abs(lidx-i));
-	        	if (doi > -distance) visitDescendants(c, null);
-	        }
-	    }
-
-		
-	} // end of class FisheyeTreeFilter
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/filter/GraphDistanceFilter.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/filter/GraphDistanceFilter.as
deleted file mode 100644
index f6254a77f5..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/filter/GraphDistanceFilter.as
+++ /dev/null
@@ -1,91 +0,0 @@
-package flare.vis.operator.filter
-{
-	import flare.vis.operator.Operator;
-	import flare.animate.Transitioner;
-	import flare.vis.data.NodeSprite;
-	import flash.utils.Dictionary;
-	import flare.vis.data.EdgeSprite;
-	import flare.vis.data.DataSprite;
-	import flare.vis.data.Data;
-
-	/**
-	 * Filter operator that sets visible all items within a specified graph
-	 * distance from a set of focus nodes.
-	 */
-	public class GraphDistanceFilter extends Operator
-	{
-		/** An array of focal NodeSprites. */
-		public var focusNodes:/*NodeSprite*/Array;
-		/** Graph distance within which which items wll be visible. */
-		public var distance:int;
-		/** Flag indicating which graph links to traverse. */
-		public var links:int;
-		
-		/**
-		 * Creates a new GraphDistanceFilter.
-		 * @param focusNodes an array of focal NodeSprites. Graph distance is
-		 *  measured as the minimum number of edge-hops to one of these nodes.
-		 * @param distance graph distance within which items will be visible
-		 * @param links flag indicating which graph links to traverse. The
-		 *  default value is <code>NodeSprite.GRAPH_LINKS</code>.
-		 */		
-		public function GraphDistanceFilter(focusNodes:Array, distance:int=1,
-			links:int=3/*NodeSprite.GRAPH_LINKS*/)
-		{
-			this.focusNodes = focusNodes;
-			this.distance = distance;
-			this.links = links;
-		}
-		
-		/** @inheritDoc */
-		public override function operate(t:Transitioner=null):void
-		{
-			t = (t==null ? Transitioner.DEFAULT : t);
-	        
-	        // initialize breadth-first traversal
-	        var q:Array = [], depths:Dictionary = new Dictionary();
-			for each (var fn:NodeSprite in focusNodes) {				
-				depths[fn] = 0;
-				fn.visitEdges(function(e:EdgeSprite):void {
-					depths[e] = 1;
-					q.push(e);
-				}, links);
-			}
-			
-			// perform breadth-first traversal
-			var xe:EdgeSprite, xn:NodeSprite, d:int;
-			while (q.length > 0) {
-				xe = q.shift(); d = depths[xe];
-				xn = (depths[xe.source] == undefined ? xe.source : xe.target);
-				depths[xn] = d;
-				if (d == distance) continue; // stop traversal at max distance
-				
-				xn.visitEdges(function(e:EdgeSprite):void {
-					if (depths[e] == undefined) {
-						depths[e] = d+1;
-						q.push(e);
-					}
-				}, links);
-			}
-			
-			// now set visibility based on traversal results
-	        visualization.data.visit(function(ds:DataSprite):void {
-	        	var visible:Boolean = (depths[ds] != undefined);
-	        	var alpha:Number = visible ? 1 : 0;
-				var obj:Object = t.$(ds);
-				
-				obj.alpha = alpha;
-				if (ds is NodeSprite) {
-					var ns:NodeSprite = ds as NodeSprite;
-					ns.expanded = (visible && depths[ds] < distance);
-				}
-				if (t.immediate) {
-					ds.visible = visible;
-				} else {
-					obj.visible = visible;
-				}
-	        }, Data.ALL);
-		}
-		
-	} // end of class GraphDistanceFilter
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/filter/VisibilityFilter.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/filter/VisibilityFilter.as
deleted file mode 100644
index d5eb457b2f..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/filter/VisibilityFilter.as
+++ /dev/null
@@ -1,69 +0,0 @@
-package flare.vis.operator.filter
-{
-	import flare.vis.operator.Operator;
-	import flare.animate.Transitioner;
-	import flare.vis.data.Data;
-	import flare.vis.data.DataSprite;
-
-	/**
-	 * Filter operator that sets item visibility based on a filtering
-	 * condition. Filtering conditions are specified using Boolean-valued
-	 * predicate functions that return true if the item meets the filtering
-	 * criteria and false if it does not. For items which meet the criteria,
-	 * this class sets the <code>visibility</code> property to true and
-	 * the <code>alpha</code> value to 1. For those items that do not meet
-	 * the criteria, this class sets the <code>visibility</code> property to
-	 * false and the <code>alpha</code> value to 0.
-	 * 
-	 * <p>Predicate functions can either be arbitrary functions that take
-	 * a single argument and return a Boolean value, or can be systematically
-	 * constructed using the <code>Expression</code> language provided by the
-	 * <code>flare.query</code> package.</p>
-	 * 
-	 * @see flare.query
-	 */
-	public class VisibilityFilter extends Operator
-	{
-		/** Predicate function determining item visibility. */
-		public var predicate:Function;
-		/** Flag indicating which data group (NODES, EDGES, or ALL) should
-		 *  be processed by this filter. */
-		public var which:int;
-		/** Boolean function indicating which items to process. This function
-		 *  <strong>does not</strong> determine which items will be visible, it
-		 *  only determines which items are visited by this operator. Only
-		 *  items for which this function return true will be considered by the
-		 *  VisibilityFilter. If the function is null, all items will be
-		 *  considered. */
-		public var filter:Function;
-		
-		/**
-		 * Creates a new VisibilityFilter.
-		 * @param predicate the predicate function for filtering items. This
-		 *  should be a Boolean-valued function that returns true for items
-		 *  that pass the filtering criteria and false for those that do not.
-		 * @param which flag indicating which data group (NODES, EDGES, or ALL)
-		 *  should be processed by this filter.
-		 */
-		public function VisibilityFilter(predicate:Function,
-						which:int=1/*Data.NODES*/, filter:Function=null)
-		{
-			this.predicate = predicate;
-			this.which = which;
-			this.filter = filter;
-		}
-
-		/** @inheritDoc */
-		public override function operate(t:Transitioner=null):void
-		{
-			t = (t==null ? Transitioner.DEFAULT : t);
-			
-			visualization.data.visit(function(d:DataSprite):void {
-				var visible:Boolean = predicate(d);
-				t.$(d).alpha = visible ? 1 : 0;
-				t.$(d).visible = visible;
-			}, which, filter);
-		}
-		
-	} // end of class VisibilityFilter
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/layout/AxisLayout.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/layout/AxisLayout.as
deleted file mode 100644
index 9aee6edd5d..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/layout/AxisLayout.as
+++ /dev/null
@@ -1,216 +0,0 @@
-package flare.vis.operator.layout
-{
-	import flare.animate.Transitioner;
-	import flare.util.Property;
-	import flare.vis.axis.Axis;
-	import flare.vis.axis.CartesianAxes;
-	import flare.vis.data.Data;
-	import flare.vis.data.DataSprite;
-	import flare.vis.scale.LinearScale;
-	import flare.vis.scale.ScaleType;
-	import flare.vis.scale.Scales;
-	
-	/**
-	 * Layout that places items according to data properties along the X and Y
-	 * axes. The AxisLayout can also compute stacked layouts, in which elements
-	 * that share the same data values along an axis can be consecutively
-	 * stacked on top of each other.
-	 */
-	public class AxisLayout extends Layout
-	{
-		public static const ALWAYS:int = 2;
-		public static const SETUP:int = 1;
-		public static const NEVER:int = 0;
-		
-		protected var _initAxes:int = SETUP;
-		protected var _xStacks:Boolean = false;
-		protected var _yStacks:Boolean = false;		
-		protected var _xField:Property;
-		protected var _yField:Property;
-		protected var _t:Transitioner;
-		
-		/** The scale type parameter for the x-axis. */
-		protected var _xScaleType:String = ScaleType.LINEAR;
-		/** A parameter for the scale instance for the x-axis. */
-		protected var _xScaleParam:Number = 10;
-		/** The scale type parameter for the y-axis. */
-		protected var _yScaleType:String = ScaleType.LINEAR;
-		/** A parameter for the scale instance for the y-axis. */
-		protected var _yScaleParam:Number = 10;
-		
-		// ------------------------------------------------
-		
-		/** The x-axis source property. */
-		public function get xField():String {
-			return _xField==null ? null : _xField.name;
-		}
-		public function set xField(f:String):void {
-			_xField = Property.$(f); initializeAxes();
-		}
-		
-		/** The y-axis source property. */
-		public function get yField():String {
-			return _yField==null ? null : _yField.name;
-		}
-		public function set yField(f:String):void {
-			_yField = Property.$(f); initializeAxes();
-		}
-		
-		/** Flag indicating if values should be stacked according to their
-		 *  x-axis values. */
-		public function get xStacked():Boolean { return _xStacks; }
-		public function set xStacked(b:Boolean):void { _xStacks = b; }
-
-		/** Flag indicating if values should be stacked according to their
-		 *  y-axis values. */
-		public function get yStacked():Boolean { return _yStacks; }
-		public function set yStacked(b:Boolean):void { _yStacks = b; }
-		
-		/** The scale type parameter for the x-axis.
-		 *  @see flare.vis.scale.Scales */
-		public function get xScaleType():String { return _xScaleType; }
-		public function set xScaleType(st:String):void { _xScaleType = st; setup(); }
-		
-		/** A parameter for the scale instance for the x-axis. Used as input
-		 *  to the <code>flare.vis.scale.Scales.scale method. */
-		public function get xScaleParam():Number { return _xScaleParam; }
-		public function set xScaleParam(p:Number):void { _xScaleParam = p; setup(); }
-		
-		/** The scale type parameter for the y-axis.
-		 *  @see flare.vis.scale.Scales */
-		public function get yScaleType():String { return _yScaleType; }
-		public function set yScaleType(st:String):void { _yScaleType = st; setup(); }
-		
-		/** A parameter for the scale instance for the y-axis. Used as input
-		 *  to the <code>flare.vis.scale.Scales.scale method. */
-		public function get yScaleParam():Number { return _yScaleParam; }
-		public function set yScaleParam(p:Number):void { _yScaleParam = p; setup(); }
-		
-		/** The policy for when axes should be initialized by this layout.
-		 *  One of NEVER, SETUP (to initialize only on setup), and ALWAYS. */
-		public function get initAxes():int { return _initAxes; }
-		public function set initAxes(policy:int):void { _initAxes = policy; }
-		
-		// --------------------------------------------------------------------
-		
-		/**
-		 * Creates a new AxisLayout
-		 * @param xAxisField the x-axis source property
-		 * @param yAxisField the y-axis source property
-		 * @param xStacked indicates if values should be stacked according to
-		 *  their x-axis values
-		 * @param yStacked indicates if values should be stacked according to
-		 *  their y-axis values
-		 */		
-		public function AxisLayout(xAxisField:String=null, yAxisField:String=null,
-								   xStacked:Boolean=false, yStacked:Boolean=false)
-		{
-			_xField = Property.$(xAxisField);
-			_yField = Property.$(yAxisField);
-			_xStacks = xStacked;
-			_yStacks = yStacked;
-		}
-		
-		/** @inheritDoc */
-		public override function setup():void
-		{
-			initializeAxes();
-		}
-		
-		/**
-		 * Initializes the axes prior to layout.
-		 */
-		public function initializeAxes():void
-		{
-			if (_initAxes==NEVER || visualization==null) return;
-			
-			// set axes
-			var axes:CartesianAxes = super.xyAxes, axis:Axis;
-			var data:Data = visualization.data;
-
-			axes.xAxis.axisScale = data.scale(
-				_xField.name, Data.NODES, _xScaleType, _xScaleParam);
-			axes.yAxis.axisScale = data.scale(
-				_yField.name, Data.NODES, _yScaleType, _yScaleParam);
-		}
-		
-		/** @inheritDoc */
-		public override function operate(t:Transitioner=null):void
-		{
-			_t = (t != null ? t : Transitioner.DEFAULT);
-			if (_initAxes==ALWAYS) initializeAxes();
-			if (_xStacks || _yStacks) { rescale(); }
-						
-			var axes:CartesianAxes = super.xyAxes;
-			var x0:Number = axes.originX;
-			var y0:Number = axes.originY;
-
-			var xmap:Object = _xStacks ? new Object() : null;
-			var ymap:Object = _yStacks ? new Object() : null;
-			
-			visualization.data.nodes.visit(function(d:DataSprite):void {
-				var dx:Object, dy:Object, x:Number, y:Number, s:Number, z:Number;
-				var o:Object = _t.$(d);
-				dx = _xField.getValue(d); dy = _yField.getValue(d);
-				
-				if (_xField != null) {
-					x = axes.xAxis.X(dx);
-					if (_xStacks) {
-						z = x - x0;
-						s = z + (isNaN(s=xmap[dy]) ? 0 : s);
-						o.x = x0 + s;
-						o.w = z;
-						xmap[dy] = s;
-					} else {
-						o.x = x;
-						o.w = x - x0;
-					}
-				}
-				if (_yField != null) {
-					y = axes.yAxis.Y(dy);
-					if (_yStacks) {
-						z = y - y0;
-						s = z + (isNaN(s=ymap[dx]) ? 0 : s);
-						o.y = y0 + s;
-						o.h = z;
-						ymap[dx] = s;
-					} else {
-						o.y = y;
-						o.h = y - y0;
-					}
-				}
-			});
-			
-			_t = null;
-		}
-		
-		private function rescale():void {
-			var xmap:Object = _xStacks ? new Object() : null;
-			var ymap:Object = _yStacks ? new Object() : null;
-			var xmax:Number = 0;
-			var ymax:Number = 0;
-			
-			visualization.data.nodes.visit(function(d:DataSprite):void {
-				var x:Object = _xField.getValue(d);
-				var y:Object = _yField.getValue(d);
-				var v:Number;
-				
-				if (_xStacks) {
-					v = isNaN(xmap[y]) ? 0 : xmap[y];
-					xmap[y] = v = (Number(x) + v);
-					if (v > xmax) xmax = v;
-				}
-				if (_yStacks) {
-					v = isNaN(ymap[x]) ? 0 : ymap[x];
-					ymap[x] = v = (Number(y) + v);
-					if (v > ymax) ymax = v;
-				}
-			});
-			
-			var axes:CartesianAxes = visualization.xyAxes;
-			if (_xStacks) axes.xAxis.axisScale = new LinearScale(0, xmax);
-			if (_yStacks) axes.yAxis.axisScale = new LinearScale(0, ymax);
-		}
-		
-	} // end of class AxisLayout
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/layout/CircleLayout.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/layout/CircleLayout.as
deleted file mode 100644
index dae1a47fe3..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/layout/CircleLayout.as
+++ /dev/null
@@ -1,127 +0,0 @@
-package flare.vis.operator.layout
-{
-	import flare.animate.Transitioner;
-	import flare.vis.data.Data;
-	import flash.geom.Rectangle;
-	import flare.vis.data.EdgeSprite;
-	import flare.vis.data.NodeSprite;
-	
-	/**
-	 * Layout that places items in a circle. The order in which items are
-	 * placed can be determined either by the sort order of the data container
-	 * or through a barycentric sorting technique for graph structures. The
-	 * barycentric sort attempts to sort items based on their connectivity to
-	 * other items; this often results in different graph clusters emerging
-	 * along the final sort order.
-	 */
-	public class CircleLayout extends Layout
-	{
-		private var _barysort:Boolean = false;
-		private var _weight:String = null; // TODO: update this to use a Property instance
-		private var _edges:uint = NodeSprite.ALL_LINKS;
-		private var _padding:Number = 0.05;
-		private var _t:Transitioner;
-		
-		/** Flag indicating if barycentric sorting using the graph structure
-		 *  should be performed. */
-		public function get sortByEdges():Boolean { return _barysort; }
-		public function set sortByEdges(b:Boolean):void { _barysort = b; }
-		
-		/**
-		 * Creates a new CircleLayout.
-		 * @param sortbyEdges Flag indicating if barycentric sorting using
-		 *  the graph structure should be performed
-		 */
-		public function CircleLayout(sortByEdges:Boolean=false) {
-			this.sortByEdges = sortByEdges;
-		}
-		
-		/** @inheritDoc */
-		public override function operate(t:Transitioner=null):void
-		{
-			_t = (t!=null ? t : Transitioner.DEFAULT);
-			
-			var d:Data = visualization.data;
-			var nn:uint = d.nodes.size, i:int = 0;
-	        var items:Array = new Array(nn);
-	        for (i=0; i<nn; ++i) items[i] = d.nodes[i];
-	        
-	        // sort by barycenter
-	        if (_barysort && d.edges.size > 0) {
-		         barysort(items);
-			}
-			
-			// perform the layout
-			var r:Rectangle = layoutBounds;
-			var cx:Number = (r.x + r.width) / 2;
-			var cy:Number = (r.y + r.height) / 2;
-			var rx:Number = (0.5 - _padding) * r.width;
-			var ry:Number = (0.5 - _padding) * r.height;
-
-			for (i=0; i<items.length; i++) {
-				var n:NodeSprite = items[i];
-				var angle:Number = i*2*Math.PI / nn;
-				_t.$(n).x = Math.cos(angle)*rx + cx;
-				_t.$(n).y = Math.sin(angle)*ry + cy;
-        	}
-			
-			updateEdgePoints(_t);
-			_t = null;
-		}
-		
-		/**
-		 * Sort the items around the circle according to the
-		 * barycenters of the individual nodes.
-		 */
-		private function barysort(items:Array):void
-		{
-			var niters:uint = 700, i:uint=0, k:uint;
-			var inertia:Number = 0;
-			var weight:Number;
-			var unchanged:Boolean;
-			
-			// u --> index position
-			// v --> barycenter
-			for (i=0; i<items.length; ++i) {
-				items[i].u = items[i].v = i;
-			}
-			
-			for (i=0; i<niters; ++i) {
-				inertia = (i / (niters-1));
-				
-	        	// sort by barycenters, update each position index
-	        	items.sortOn("v", Array.NUMERIC);
-	            for (unchanged=(i>0), k=0; k<items.length; ++k) {
-	            	if (unchanged && items[k].u != k)
-	            		unchanged = false;
-	            	items[k].u = k;
-	            }
-	            if (unchanged) break; // if no difference, we're done
-	            
-	            // for each node, compute the new barycenter
-	            for (k=0; k<items.length; ++k) {
-	            	var n:NodeSprite = items[k];
-	                weight = inertia;
-	                n.v = weight * n.u;
-	                
-	                n.visitEdges(function(e:EdgeSprite):void
-	                {
-	                	// retrieve the edge weight
-	                	var w:Number = _weight==null ? 1.0 : e.props[_weight];
-	                	if (isNaN(w)) w = 1.0;
-	                	w = Math.exp(w); // transform the weight
-	                	
-	                	// add weighted distance to barycenter
-	                	n.v += w * e.other(n).u;
-	                	weight += w;
-	                });
-	                
-	                // normalize to get final barycenter value
-	                n.v /= weight;
-	            }
-	        }
-			items.sortOn("v", Array.NUMERIC);
-		}
-		
-	} // end of class CircleLayout
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/layout/DendrogramLayout.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/layout/DendrogramLayout.as
deleted file mode 100644
index e74bfa6803..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/layout/DendrogramLayout.as
+++ /dev/null
@@ -1,161 +0,0 @@
-package flare.vis.operator.layout
-{
-	import flare.animate.Transitioner;
-	import flare.util.Property;
-	import flare.vis.data.EdgeSprite;
-	import flare.vis.data.NodeSprite;
-	
-	/**
-	 * Layout that places items in a dendrogram for displaying the results of a
-	 * hierarchical clustering. This class computes a dendrogram layout and sets
-	 * edge control points to create "U" shaped dendrogram branches. It is
-	 * common, though by no means required, to hide the node instances in a
-	 * dendrogram display.
-	 * 
-	 * <p>To determine the height of dendrogram branches, a distance property
-	 * can be provided. The values of this property will directly determine
-	 * node heights by laying out the depth axis using a linear scale of
-	 * distance values. The distance property should be set for all non-leaf
-	 * nodes in the tree. Typically, leaf nodes have a distance of zero,
-	 * resulting in an aligned list of leaf nodes.</p>
-	 */
-	public class DendrogramLayout extends Layout
-	{
-		// TODO: support axes, too
-		
-		private var _orient:String = Orientation.TOP_TO_BOTTOM; // the orientation of the tree
-		private var _dp:Property;
-		private var _t:Transitioner; // temp variable for transitioner access
-		
-		private var _leafCount:int;
-		private var _leafIndex:int = 0;
-		private var _maxDist:Number;
-		private var _b1:Number;
-		private var _db:Number;
-		private var _d1:Number;
-		private var _dd:Number;
-		
-		/** Data property to use as the distance field for
-		 *  determining the height values of dendrogram branches. */
-		public function get distanceProperty():String { return _dp.name; }
-		public function set distanceProperty(dp:String):void {
-			_dp = Property.$(dp);
-		}
-		
-		/** The orientation of the dendrogram */
-		public function get orientation():String { return _orient; }
-		public function set orientation(o:String):void { _orient = o; }
-		
-		/**
-		 * Creates a new DendrogramLayout.
-		 * @param distField data property to use as the distance field for
-		 *  determining the height values of dendrogram branches
-		 * @param orientation the orientation of the dendrogram
-		 */
-		public function DendrogramLayout(distField:String=null,
-			orientation:String=Orientation.TOP_TO_BOTTOM)
-		{
-			_dp = distField==null ? null : Property.$(distField);
-			_orient = orientation;
-		}
-		
-		/** @inheritDoc */
-		public override function operate(t:Transitioner=null):void
-		{
-			_t = (t == null ? Transitioner.DEFAULT : t);
-			init();
-			layout(visualization.tree.root);
-		}
-		
-		/**
-		 * Initialize the layout.
-		 */
-		private function init():void
-		{
-			var root:NodeSprite = visualization.tree.root;
-			_leafCount = visualization.tree.countLeaves();
-			_leafIndex = 0;
-			_maxDist = _dp!=null ? _dp.getValue(root) : computeHeights(root);
-			
-			switch (_orient) {
-				case Orientation.TOP_TO_BOTTOM:
-					_b1 = layoutBounds.left;
-					_db = layoutBounds.width;
-					_d1 = layoutBounds.bottom;
-					_dd = -layoutBounds.height;
-					break;
-				case Orientation.BOTTOM_TO_TOP:
-					_b1 = layoutBounds.left;
-					_db = layoutBounds.width;
-					_d1 = layoutBounds.top;
-					_dd = layoutBounds.height;
-					break;
-				case Orientation.LEFT_TO_RIGHT:
-					_b1 = layoutBounds.top;
-					_db = layoutBounds.height;
-					_d1 = layoutBounds.right;
-					_dd = -layoutBounds.width;
-					break;
-				case Orientation.RIGHT_TO_LEFT:
-					_b1 = layoutBounds.top;
-					_db = layoutBounds.height;
-					_d1 = layoutBounds.left;
-					_dd = layoutBounds.width;
-					break;
-			}
-		}
-		
-		private function computeHeights(n:NodeSprite):int
-		{
-			n.u = 0;
-			for (var i:int=0; i<n.childDegree; ++i) {
-				n.u = Math.max(n.u, 1 + computeHeights(n.getChildNode(i)));
-			}
-			return n.u;
-		}
-		
-		private function layout(n:NodeSprite):Number
-		{
-			var d:Number = _dp!=null ? _dp.getValue(n) : n.u;
-			d = _d1 + _dd * (d / _maxDist);
-			
-			if (n.childDegree > 0) {
-				var b:Number = 0, bc:Number;
-				for (var i:int=0; i<n.childDegree; ++i) {
-					var c:NodeSprite = n.getChildNode(i);
-					b += (bc=layout(c));
-					layoutEdge(c.parentEdge, bc, d);
-				}
-				b /= n.childDegree;
-			} else {
-				var step:Number = 1.0 / _leafCount;
-				b = _b1 + _db * step * (0.5 + _leafIndex++);
-			}
-			layoutNode(n, b, d);
-			return b;
-		}
-		
-		private function layoutNode(n:NodeSprite, b:Number, d:Number):void
-		{
-			var o:Object = _t.$(n);
-			if (Orientation.isVertical(_orient)) {
-				o.x = b; o.y = d;
-			} else {
-				o.x = d; o.y = b;
-			}
-		}
-		
-		private function layoutEdge(e:EdgeSprite, b:Number, d:Number):void
-		{
-			var vert:Boolean = Orientation.isVertical(_orient);
-			var o:Object = _t.$(e);
-			if (e.points == null) {
-				var s:NodeSprite = e.source;
-				var t:NodeSprite = e.target;
-				e.points = [(s.x+t.x)/2, (s.y+t.y)/2];
-			}
-			_t.$(e).points = vert ? [b, d] : [d, b];
-		}
-		
-	} // end of class DendrogramLayout
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/layout/ForceDirectedLayout.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/layout/ForceDirectedLayout.as
deleted file mode 100644
index 944294c827..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/layout/ForceDirectedLayout.as
+++ /dev/null
@@ -1,233 +0,0 @@
-package flare.vis.operator.layout
-{
-	import flare.animate.Transitioner;
-	import flare.physics.Particle;
-	import flare.physics.Simulation;
-	import flare.physics.Spring;
-	import flare.vis.data.Data;
-	import flare.vis.data.DataSprite;
-	import flare.vis.data.EdgeSprite;
-	import flare.vis.data.NodeSprite;
-	
-	/**
-	 * Layout that positions graph items based on a physics simulation of
-	 * interacting forces; by default, nodes repel each other, edges act as
-	 * springs, and drag forces (similar to air resistance) are applied. This
-	 * algorithm can be run for multiple iterations for a run-once layout
-	 * computation or repeatedly run in an animated fashion for a dynamic and
-	 * interactive layout (set <code>Visualization.continuousUpdates = true
-	 * </code>).
-	 * 
-	 * <p>The running time of this layout algorithm is the greater of O(N log N)
-	 * and O(E), where N is the number of nodes and E the number of edges.
-	 * The addition of custom forces to the simulation may affect this.</p>
-	 * 
-	 * <p>The force directed layout is implemented using the physics simulator
-	 * provided by the <code>flare.physics</code> package. The
-	 * <code>Simulation</code> used to drive this layout can be set explicitly,
-	 * allowing any number of custom force directed layouts to be created
-	 * through the selection of <code>IForce</code> modules. Each node in the
-	 * layout is mapped to a <code>Particle</code> instance and each edge
-	 * to a <code>Spring</code> in the simulation. Once the simulation has been
-	 * initialized, you can retrieve these instances through the
-	 * <code>node.props.particle</code> and <code>edge.props.spring</code>
-	 * properties, respectively.</p>
-	 * 
-	 * @see flare.physics
-	 */
-	public class ForceDirectedLayout extends Layout
-	{
-		private var _sim:Simulation;
-		private var _step:Number = 1;
-		private var _iter:int = 1;
-		private var _gen:uint = 0;
-		private var _enforceBounds:Boolean = false;
-		
-		// simulation defaults
-		private var _mass:Number = 1;
-		private var _restLength:Number = 30;
-		private var _tension:Number = 0.3;
-		private var _damping:Number = 0.1;
-		
-		private var _t:Transitioner;
-		
-		/** The default mass value for node/particles. */
-		public function get defaultParticleMass():Number { return _mass; }
-		public function set defaultParticleMass(v:Number):void { _mass = v; }
-		
-		/** The default spring rest length for edge/springs. */
-		public function get defaultSpringLength():Number { return _restLength; }
-		public function set defaultSpringLength(v:Number):void { _restLength = v; }
-		
-		/** The default spring tension for edge/springs. */
-		public function get defaultSpringTension():Number { return _tension; }
-		public function set defaultSpringTension(v:Number):void { _tension = v; }
-		
-		/** The number of iterations to run the simulation per invocation
-		 *  (default is 1, expecting continuous updates). */
-		public function get iterations():int { return _iter; }
-		public function set iterations(iter:int):void { _iter = iter; }
-		
-		/** The number of time ticks to advance the simulation on each
-		 *  iteration (default is 1). */
-		public function get ticksPerIteration():int { return _step; }
-		public function set ticksPerIteration(ticks:int):void { _step = ticks; }
-		
-		/** The physics simulation driving this layout. */
-		public function get simulation():Simulation { return _sim; }
-		
-		/** Flag indicating if the layout bounds should be enforced. 
-		 *  If true, the layoutBounds will limit node placement. */
-		public function get enforceBounds():Boolean { return _enforceBounds; }
-		public function set enforceBounds(b:Boolean):void { _enforceBounds = b; }
-		
-		// --------------------------------------------------------------------
-		
-		/**
-		 * Creates a new ForceDirectedLayout.
-		 * @param iterations the number of iterations to run the simulation
-		 *  per invocation
-		 * @param sim the physics simulation to use for the layout. If null
-		 *  (the default), default simulation settings will be used
-		 */
-		public function ForceDirectedLayout(enforceBounds:Boolean=false, 
-			iterations:int=1, sim:Simulation=null)
-		{
-			_enforceBounds = enforceBounds;
-			_iter = iterations;
-			_sim = (sim==null ? new Simulation(0, 0, 0.1, -10) : sim);
-		}
-		
-		/** @inheritDoc */
-		public override function operate(t:Transitioner=null):void
-		{
-			_t = (t!=null ? t : Transitioner.DEFAULT);
-			
-			++_gen; // update generation counter
-			init(); // populate simulation
-			
-			// run simulation
-			_sim.bounds = _enforceBounds ? layoutBounds : null;
-			for (var i:uint=0; i<_iter; ++i) {
-				_sim.tick(_step);
-			}
-			visualization.data.nodes.visit(update); // update positions
-			
-			updateEdgePoints(_t);
-			_t = null;
-		}
-		
-		// -- value transfer --------------------------------------------------
-		
-		/**
-		 * Transfer the physics simulation results to an item's layout.
-		 * @param d a DataSprite
-		 * @return true, to signal a visitor to continue
-		 */
-		protected function update(d:DataSprite):void
-		{
-			var p:Particle = d.props.particle;
-			if (!p.fixed) {
-				var o:Object = _t.$(d);
-				o.x = p.x;
-				o.y = p.y;
-			}
-		}
-		
-		// -- simulation management -------------------------------------------
-		
-		/**
-		 * Initializes the Simulation for this ForceDirectedLayout
-		 */
-		protected function init():void
-		{
-			var data:Data = visualization.data;
-			var p:Particle, s:Spring, n:NodeSprite, e:EdgeSprite;
-			
-			// initialize all simulation entries
-			for each (n in data.nodes) {
-				p = n.props.particle;
-				if (p == null) {
-					n.props.particle = (p = _sim.addParticle(_mass, n.x, n.y));
-					p.fixed = n.fixed;
-				} else {
-					p.x = n.x;
-					p.y = n.y;
-					p.fixed = n.fixed;
-				}
-				p.tag = _gen;
-			}
-			for each (e in data.edges) {
-				s = e.props.spring;
-				if (s == null) {
-					e.props.spring = (s = _sim.addSpring(
-						e.source.props.particle, e.target.props.particle,
-						_restLength, _tension, _damping));
-				}
-				s.tag = _gen;
-			}
-			
-			// set up simulation parameters
-			for each (n in data.nodes) {
-				p = n.props.particle;
-				p.mass = mass(n);
-			}
-			for each (e in data.edges) {
-				s = e.props.spring;
-				s.restLength = restLength(e);
-				s.tension = tension(e);
-				s.damping = damping(e);
-			}
-			
-			// clean-up unused items
-			for each (p in _sim.particles)
-				if (p.tag != _gen) p.kill();
-			for each (s in _sim.springs)
-				if (s.tag != _gen) s.kill();
-		}
-		
-		/**
-		 * Function for assigning mass values to particles. By default, this
-		 * simply returns the default mass value. This function can be replaced
-		 * to perform custom mass assignment.
-		 */
-		public var mass:Function = function(d:DataSprite):Number {
-			return _mass;
-		}
-		
-		/**
-		 * Function for assigning rest length values to springs. By default,
-		 * this simply returns the default rest length value. This function can
-		 * be replaced to perform custom rest length assignment.
-		 */
-		public var restLength:Function = function(e:EdgeSprite):Number {
-			return _restLength;
-		}
-		
-		/**
-		 * Function for assigning tension values to springs. By default, this
-		 * method computes spring tension adaptively, based on the connectivity
-		 * of the attached particles, to create more stable layouts. More
-		 * specifically, the tension is computed as the default tension value
-		 * divided by the square root of the maximum degree of the attached
-		 * particles. This function can be replaced to perform custom tension
-		 * assignment.
-		 */
-		public var tension:Function = function(e:EdgeSprite):Number {
-			var s:Spring = Spring(e.props.spring);
-			var n:Number = Math.max(s.p1.degree, s.p2.degree);
-			return _tension / Math.sqrt(n);
-		}
-		
-		/**
-		 * Function for assigning damping constant values to springs. By
-		 * default, this simply uses the spring's computed tension value
-		 * divided by 10. This function can be replaced to perform custom
-		 * damping assignment.
-		 */
-		public var damping:Function = function(e:EdgeSprite):Number {
-			return Spring(e.props.spring).tension / 10;
-		}
-		
-	} // end of class ForceDirectedLayout
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/layout/IndentedTreeLayout.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/layout/IndentedTreeLayout.as
deleted file mode 100644
index 102c0cc403..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/layout/IndentedTreeLayout.as
+++ /dev/null
@@ -1,101 +0,0 @@
-package flare.vis.operator.layout
-{
-	import flare.vis.data.NodeSprite;
-	import flare.animate.Transitioner;
-	import flash.geom.Point;
-	import flare.util.Arrays;
-	import flare.vis.data.EdgeSprite;
-	
-	/**
-	 * Layout that places tree nodes in an indented outline layout.
-	 */
-	public class IndentedTreeLayout extends Layout
-	{		
-		private var _bspace:Number = 5;  // the spacing between sibling nodes
-    	private var _dspace:Number = 50; // the spacing between depth levels
-    	private var _depths:Array = new Array(20); // TODO make sure array regrows as needed
-    	private var _maxDepth:int = 0;
-    	private var _ax:Number, _ay:Number; // for holding anchor co-ordinates
-		private var _t:Transitioner; // temp variable for transitioner access
-		
-		/** The spacing to use between depth levels (the amount of indent). */
-		public function get depthSpacing():Number { return _dspace; }
-		public function set depthSpacing(s:Number):void { _dspace = s; }
-		
-		/** The spacing to use between rows in the layout. */
-		public function get breadthSpacing():Number { return _bspace; }
-		public function set breadthSpacing(s:Number):void { _bspace = s; }
-		
-		// --------------------------------------------------------------------
-		
-		/**
-		 * Creates a new IndentedTreeLayout.
-		 * @param depthSpace the amount of indent between depth levels
-		 * @param breadthSpace the amount of spacing between rows
-		 */		
-		public function IndentedTreeLayout(depthSpace:Number=50,
-										   breadthSpace:Number=5)
-		{
-			_bspace = breadthSpace;
-			_dspace = depthSpace;
-		}
-		
-		/** @inheritDoc */
-		public override function operate(t:Transitioner=null):void
-		{
-			_t = t!=null ? t : Transitioner.DEFAULT; // set transitioner
-			
-        	Arrays.fill(_depths, 0);
-        	_maxDepth = 0;
-        
-        	var a:Point = layoutAnchor;
-        	_ax = a.x; _ay = a.y;
-        
-        	var root:NodeSprite = layoutRoot as NodeSprite;
-        	if (root == null) return; // TODO: throw exception?
-        	
-        	layoutNode(root,0,0,true);      
-
-        	_t = null; // clear transitioner reference
-    	}
-    	
-    	
-    	private function layoutNode(node:NodeSprite, height:Number, indent:uint, visible:Boolean):Number
-    	{
-    		var x:Number = _ax + indent * _dspace;
-    		var y:Number = _ay + height;
-    		var o:Object = _t.$(node);
-    		
-    		// update node
-    		o.x = x;
-    		o.y = y;
-    		o.alpha = visible ? 1.0 : 0.0;
-    		
-    		// update edge
-    		if (node.parentEdge != null) 
-    		{
-    			var e:EdgeSprite = node.parentEdge;
-    			var p:NodeSprite = node.parentNode;
-    			o = _t.$(e); 
-    			o.alpha = visible ? 1.0 : 0.0;
-    			if (e.points == null) {
-					e.points = [(p.x+node.x)/2, (p.y+node.y)/2];
-    			}
-    			o.points = [_t.getValue(p,"x"), y];
-    		}
-    		
-    		if (visible) { height += node.height + _bspace; }
-    		if (!node.expanded) { visible = false; }
-    		
-    		if (node.childDegree > 0) // is not a leaf node
-    		{    			
-    			var c:NodeSprite = node.firstChildNode;   			
-    			for (; c != null; c = c.nextNode) {
-    				height = layoutNode(c, height, indent+1, visible);
-    			}
-    		}
-    		return height;
-    	}
-    	
-	} // end of class IndentedTreeLayout
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/layout/Layout.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/layout/Layout.as
deleted file mode 100644
index 17d45f26c2..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/layout/Layout.as
+++ /dev/null
@@ -1,175 +0,0 @@
-package flare.vis.operator.layout
-{
-	import flare.vis.operator.Operator;
-	import flash.geom.Point;
-	import flare.vis.data.DataSprite;
-	import flash.geom.Rectangle;
-	import flare.vis.data.Tree;
-	import flare.vis.data.EdgeSprite;
-	import flare.animate.Transitioner;
-	import flare.vis.axis.Axes;
-	import flare.vis.axis.CartesianAxes;
-	import flare.vis.Visualization;
-	import flare.vis.data.Data;
-	import flare.vis.data.NodeSprite;
-
-	/**
-	 * Base class for all operators that perform spatial layout. Provides
-	 * methods for retrieving the desired layout bounds, providing a layout
-	 * anchor point, and returning the layout root (for tree layouts in
-	 * particular). This class also provides convenience methods for
-	 * manipulating the visibility of axes and performing common updates
-	 * to edge control points in graph/tree visualizations.
-	 */
-	public class Layout extends Operator
-	{
-		// -- Properties ------------------------------------------------------
-		
-		private var _bounds:Rectangle = null;
-		private var _anchor:Point = new Point(0,0);
-		private var _root:DataSprite = null;
-		
-		/** The layout bounds for the layout. If this value is not explicitly
-		 *  set, the bounds for the visualization is returned. */
-		public function get layoutBounds():Rectangle {
-			if (_bounds != null) return _bounds;
-			if (visualization != null) return visualization.bounds;
-			return null;
-		}
-		public function set layoutBounds(b:Rectangle):void { _bounds = b; }
-		
-		/** The layout anchor, used by some layout instances to place an
-		 *  initial item or determine a focal point. */
-		public function get layoutAnchor():Point { return _anchor; }
-		public function set layoutAnchor(p:Point):void { _anchor = p; }
-		
-		/** The layout root, the root node for tree layouts. */
-		public function get layoutRoot():DataSprite {
-			if (_root != null) return _root;
-			if (visualization != null) {
-				return visualization.data.tree.root;
-			}
-			return null;
-		}
-		public function set layoutRoot(r:DataSprite):void { _root = r; }
-		
-		
-		// -- Axis Helpers ----------------------------------------------------
-		
-		/**
-		 * Reveals the axes.
-		 * @param t a transitioner to collect value updates
-		 * @return the input transitioner
-		 */
-		public function showAxes(t:Transitioner=null):Transitioner
-		{
-			var axes:Axes = visualization.axes;
-			if (axes == null || axes.visible) return t;
-			
-			if (t==null || t.immediate) {
-				axes.alpha = 1;
-				axes.visible = true;
-			} else {
-				t.$(axes).alpha = 1;
-				t.$(axes).visible = true;
-			}
-			return t;
-		}
-		
-		/**
-		 * Hides the axes.
-		 * @param t a transitioner to collect value updates
-		 * @return the input transitioner
-		 */
-		public function hideAxes(t:Transitioner=null):Transitioner
-		{
-			var axes:Axes = visualization.axes;
-			if (axes == null || !axes.visible) return t;
-			
-			if (t==null || t.immediate) {
-				axes.alpha = 0;
-				axes.visible = false;
-			} else {
-				t.$(axes).alpha = 0;
-				t.$(axes).visible = false;
-			}
-			return t;
-		}
-		
-		/**
-		 * Returns the visualization's axes as a CartesianAxes instance.
-		 * Creates/modifies existing axes as needed to ensure the
-		 * presence of CartesianAxes.
-		 */
-		protected function get xyAxes():CartesianAxes
-		{
-			var vis:Visualization = visualization;
-			if (vis == null) return null;
-			
-			if (vis.xyAxes == null) {
-				vis.axes = new CartesianAxes();
-			}
-			return vis.xyAxes;
-		}
-		
-		// -- Edge Helpers ----------------------------------------------------
-		
-		/**
-		 * Updates all edges to be straight lines. Useful for undoing the
-		 * results of layouts that route edges using edge control points.
-		 * @param t a transitioner to collect value updates
-		 */
-		public function updateEdgePoints(t:Transitioner=null):void
-		{
-			if (t==null || t.immediate) {
-				clearEdgePoints();
-			} else {
-				var clear:Boolean = false;
-				
-				// set end points to mid-points
-				visualization.data.edges.visit(function(e:EdgeSprite):void {
-					if (e.points == null) return;
-					
-					var src:NodeSprite = e.source;
-					var trg:NodeSprite = e.target;
-					clear = true;
-					
-					// get target end points
-					var x1:Number = t.$(src).x, y1:Number = t.$(src).y;
-					var x2:Number = t.$(trg).x, y2:Number = t.$(trg).y;
-					
-					// create new control points
-					var i:uint, len:uint = e.points.length, f:Number;
-					var cp:Array = new Array(len);
-					
-					for (i=0; i<len; i+=2) {
-						f = (i+2)/(len+2);
-						cp[i]   = x1 + f * (x2 - x1);
-						cp[i+1] = y1 + f * (y2 - y1);
-					}
-					t.$(e).points = cp;
-				});
-				// after transition, clear out control points
-				if (clear) t.onEnd = clearEdgePoints;
-			}
-		}
-		
-		/**
-		 * Strips all EdgeSprites in a visualization of any control points.
-		 */
-		public function clearEdgePoints():void
-		{
-			visualization.data.edges.visit(clearPoints);
-		}
-		
-		/**
-		 * Removes any control points from a DataSprite instance.
-		 * @param d a DataSprite
-		 */
-		public function clearPoints(d:DataSprite):void
-		{
-			d.points = null;
-		}
-		
-	} // end of class Layout
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/layout/NodeLinkTreeLayout.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/layout/NodeLinkTreeLayout.as
deleted file mode 100644
index 659d1bf289..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/layout/NodeLinkTreeLayout.as
+++ /dev/null
@@ -1,381 +0,0 @@
-package flare.vis.operator.layout
-{
-	import flare.vis.operator.Operator;
-	import flare.vis.data.NodeSprite;
-	import flash.geom.Point;
-	import flare.animate.Transitioner;
-	import flare.util.Arrays;
-	
-	/**
-	 * Layout that places nodes using a tidy layout of a node-link tree
-	 * diagram. This algorithm lays out a rooted tree such that each
-	 * depth level of the tree is on a shared line. The orientation of the
-	 * tree can be set such that the tree goes left-to-right (default),
-	 * right-to-left, top-to-bottom, or bottom-to-top.
-	 * 
-	 * <p>The algorithm used is that of Christoph Buchheim, Michael Jünger,
-	 * and Sebastian Leipert from their research paper
-	 * <a href="http://citeseer.ist.psu.edu/buchheim02improving.html">
-	 * Improving Walker's Algorithm to Run in Linear Time</a>, Graph Drawing 2002.
-	 * This algorithm corrects performance issues in Walker's algorithm, which
-	 * generalizes Reingold and Tilford's method for tidy drawings of trees to
-	 * support trees with an arbitrary number of children at any given node.</p>
-	 */
-	public class NodeLinkTreeLayout extends Layout
-	{
-		// -- Properties ------------------------------------------------------
-		
-		/** Property name for storing parameters for this layout. */
-		public static const PARAMS:String = "nodeLinkTreeLayoutParams";
-		
-		private var _orient:String = Orientation.LEFT_TO_RIGHT; // orientation
-		private var _bspace:Number = 5;  // the spacing between sibling nodes
-    	private var _tspace:Number = 25; // the spacing between subtrees
-    	private var _dspace:Number = 50; // the spacing between depth levels
-    	private var _depths:Array = new Array(20); // stores depth co-ords
-    	private var _maxDepth:int = 0;
-    	private var _ax:Number, _ay:Number; // for holding anchor co-ordinates
-		private var _t:Transitioner; // temp variable for transitioner access
-		
-		/** The orientation of the layout. */
-		public function get orientation():String { return _orient; }
-		public function set orientation(o:String):void { _orient = o; }
-		
-		/** The space between successive depth levels of the tree. */
-		public function get depthSpacing():Number { return _dspace; }
-		public function set depthSpacing(s:Number):void { _dspace = s; }
-		
-		/** The space between siblings in the tree. */
-		public function get breadthSpacing():Number { return _bspace; }
-		public function set breadthSpacing(s:Number):void { _bspace = s; }
-		
-		/** The space between different sub-trees. */
-		public function get subtreeSpacing():Number { return _tspace; }
-		public function set subtreeSpacing(s:Number):void { _tspace = s; }
-		
-		
-		// -- Methods ---------------------------------------------------------
-	
-		/**
-		 * Creates a new NodeLinkTreeLayout.
-		 * @param orientation the orientation of the layout
-		 * @param depthSpace the space between depth levels in the tree
-		 * @param breadthSpace the space between siblings in the tree
-		 * @param subtreeSpace the space between different sub-trees
-		 */		
-		public function NodeLinkTreeLayout(
-			orientation:String=Orientation.LEFT_TO_RIGHT, depthSpace:Number=50,
-			breadthSpace:Number=5, subtreeSpace:Number=25)
-		{
-			_orient = orientation;
-			_dspace = depthSpace;
-			_bspace = breadthSpace;
-			_tspace = subtreeSpace;
-		}
-	
-		/** @inheritDoc */
-		public override function operate(t:Transitioner=null):void
-		{
-			_t = t!=null ? t : Transitioner.DEFAULT; // set transitioner
-			
-        	Arrays.fill(_depths, 0);
-        	_maxDepth = 0;
-        
-        	var a:Point = layoutAnchor;
-        	_ax = a.x; _ay = a.y;
-        
-        	var root:NodeSprite = layoutRoot as NodeSprite;
-        	if (root == null) { _t = null; return; }
-        	var rp:Params = params(root);
-        
-        	// do first pass - compute breadth information, collect depth info
-        	firstWalk(root, 0, 1);
-        
-        	// sum up the depth info
-        	determineDepths();
-        
-        	// do second pass - assign layout positions
-        	secondWalk(root, null, -rp.prelim, 0, true);
-        	
-        	updateEdgePoints(_t);
-        	_t = null; // clear transitioner reference
-    	}
-
-    	private function firstWalk(n:NodeSprite, num:int, depth:uint):void
-    	{
-    		var np:Params = params(n);
-    		np.number = num;
-    		updateDepths(depth, n);
-    		
-    		var expanded:Boolean = n.expanded;
-    		if (n.childDegree == 0 || !expanded) // is leaf
-    		{
-    			var l:NodeSprite = n.prevNode;
-    			np.prelim = l==null ? 0 : params(l).prelim + spacing(l,n,true);
-    		}
-    		else if (expanded) // has children, is expanded
-    		{
-    			var midpoint:Number, i:uint;
-    			var lefty:NodeSprite = n.firstChildNode;
-    			var right:NodeSprite = n.lastChildNode;
-    			var ancestor:NodeSprite = lefty;
-    			var c:NodeSprite = lefty;
-    			
-    			for (i=0; c != null; ++i, c = c.nextNode) {
-    				firstWalk(c, i, depth+1);
-    				ancestor = apportion(c, ancestor);
-    			}
-    			executeShifts(n);
-    			midpoint = 0.5 * (params(lefty).prelim + params(right).prelim);
-    			
-    			l = n.prevNode;
-    			if (l != null) {
-    				np.prelim = params(l).prelim + spacing(l,n,true);
-    				np.mod = np.prelim - midpoint;
-    			} else {
-    				np.prelim = midpoint;
-    			}
-    		}
-    	}
-    
-    	private function apportion(v:NodeSprite, a:NodeSprite):NodeSprite
-    	{
-    		var w:NodeSprite = v.prevNode;
-    		if (w != null) {
-    			var vip:NodeSprite, vim:NodeSprite, vop:NodeSprite, vom:NodeSprite;
-    			var sip:Number, sim:Number, sop:Number, som:Number;
-    			
-    			vip = vop = v;
-    			vim = w;
-    			vom = vip.parentNode.firstChildNode;
-    			
-    			sip = params(vip).mod;
-    			sop = params(vop).mod;
-    			sim = params(vim).mod;
-    			som = params(vom).mod;
-    			
-    			var shift:Number;
-    			var nr:NodeSprite = nextRight(vim);
-    			var nl:NodeSprite = nextLeft(vip);
-    			while (nr != null && nl != null) {
-    				vim = nr;
-    				vip = nl;
-    				vom = nextLeft(vom);
-    				vop = nextRight(vop);
-    				params(vop).ancestor = v;
-    				shift = (params(vim).prelim + sim) - 
-    					(params(vip).prelim + sip) + spacing(vim,vip,false);
-    				
-    				if (shift > 0) {
-    					moveSubtree(ancestor(vim,v,a), v, shift);
-    					sip += shift;
-    					sop += shift;
-    				}
-    				
-    				sim += params(vim).mod;
-                	sip += params(vip).mod;
-                	som += params(vom).mod;
-                	sop += params(vop).mod;
-                
-                	nr = nextRight(vim);
-                	nl = nextLeft(vip);
-            	}
-            	if (nr != null && nextRight(vop) == null) {
-                	var vopp:Params = params(vop);
-                	vopp.thread = nr;
-                	vopp.mod += sim - sop;
-            	}
-            	if (nl != null && nextLeft(vom) == null) {
-                	var vomp:Params = params(vom);
-                	vomp.thread = nl;
-                	vomp.mod += sip - som;
-                	a = v;
-            	}
-        	}
-        	return a;
-    	}
-    
-    	private function nextLeft(n:NodeSprite):NodeSprite
-    	{
-    		var c:NodeSprite = null;
-        	if (n.expanded) c = n.firstChildNode;
-        	return (c != null ? c : params(n).thread);
-    	}
-
-    	private function nextRight(n:NodeSprite):NodeSprite
-    	{
-    		var c:NodeSprite = null;
-    		if (n.expanded) c = n.lastChildNode;
-        	return (c != null ? c : params(n).thread);
-    	}
-
-		private function moveSubtree(wm:NodeSprite, wp:NodeSprite, shift:Number):void
-		{
-			var wmp:Params = params(wm);
-			var wpp:Params = params(wp);
-			var subtrees:Number = wpp.number - wmp.number;
-			wpp.change -= shift/subtrees;
-			wpp.shift += shift;
-			wmp.change += shift/subtrees;
-			wpp.prelim += shift;
-			wpp.mod += shift;
-		}   
-
-		private function executeShifts(n:NodeSprite):void
-		{
-			var shift:Number = 0, change:Number = 0;
-			for (var c:NodeSprite = n.lastChildNode; c != null; c = c.prevNode)
-			{
-				var cp:Params = params(c);
-				cp.prelim += shift;
-				cp.mod += shift;
-				change += cp.change;
-				shift += cp.shift + change;
-			}
-		}
-		
-		private function ancestor(vim:NodeSprite, v:NodeSprite, a:NodeSprite):NodeSprite
-		{
-			var vimp:Params = params(vim);
-			var p:NodeSprite = v.parentNode;
-			return (vimp.ancestor.parentNode == p ? vimp.ancestor : a);
-		}
-    
-    	private function secondWalk(n:NodeSprite, p:NodeSprite, m:Number, depth:uint, visible:Boolean):void
-    	{
-    		// set position
-    		var np:Params = params(n);
-    		var o:Object = _t.$(n);
-    		setBreadth(o, p, (visible ? np.prelim : 0) + m);
-    		setDepth(o, p, _depths[depth]);
-    		setVisibility(n, o, visible);
-    		
-    		// recurse
-    		var v:Boolean = n.expanded ? visible : false;
-    		var b:Number = m + (n.expanded ? np.mod : np.prelim)
-    		if (v) depth += 1;
-    		for (var c:NodeSprite = n.firstChildNode; c!=null; c=c.nextNode)
-    		{
-    			secondWalk(c, n, b, depth, v);
-    		}
-    		np.clear();
-    	}
-
-		private function setBreadth(n:Object, p:NodeSprite, b:Number):void
-		{
-			switch (_orient) {
-				case Orientation.LEFT_TO_RIGHT:
-				case Orientation.RIGHT_TO_LEFT:
-					n.y = _ay + b;
-					break;
-				case Orientation.TOP_TO_BOTTOM:
-				case Orientation.BOTTOM_TO_TOP:
-					n.x = _ax + b;
-					break;
-				default:
-					throw new Error("Unrecognized orientation value");
-			}
-		}
-
-		private function setDepth(n:Object, p:NodeSprite, d:Number):void
-		{
-			switch (_orient) {
-				case Orientation.LEFT_TO_RIGHT:
-					n.x = _ax + d;
-					break;
-				case Orientation.RIGHT_TO_LEFT:
-					n.x = _ax - d;
-					break;
-				case Orientation.TOP_TO_BOTTOM:
-					n.y = _ay + d;
-					break;
-				case Orientation.BOTTOM_TO_TOP:
-					n.y = _ax - d;
-					break;
-				default:
-					throw new Error("Unrecognized orientation value");
-			}
-		}
-		
-		private function setVisibility(n:NodeSprite, o:Object, visible:Boolean):void
-		{
-    		o.alpha = visible ? 1.0 : 0.0;
-    		o.mouseEnabled = visible;
-    		if (n.parentEdge != null) {
-    			o = _t.$(n.parentEdge);
-    			o.alpha = visible ? 1.0 : 0.0;
-    			o.mouseEnabled = visible;
-    		}
-
-		}
-		
-		private function spacing(l:NodeSprite, r:NodeSprite, siblings:Boolean):Number
-		{
-			var w:Boolean = Orientation.isVertical(_orient);
-			return (siblings ? _bspace : _tspace) + 0.5 *
-					(w ? l.width + r.width : l.height + r.height)
-    	}
-    
-    	private function updateDepths(depth:uint, item:NodeSprite):void
-    	{
-    		var v:Boolean = Orientation.isVertical(_orient);
-    		var d:Number = v ? item.height : item.width;
-
-			// resize if needed
-			if (depth >= _depths.length) {
-    			_depths = Arrays.copy(_depths, new Array(int(1.5*depth)));
-    			for (var i:int=depth; i<_depths.length; ++i) _depths[i] = 0;
-			} 
-
-        	_depths[depth] = Math.max(_depths[depth], d);
-        	_maxDepth = Math.max(_maxDepth, depth);
-    	}
-    
-    	private function determineDepths():void
-    	{
-        	for (var i:uint=1; i<_maxDepth; ++i)
-            	_depths[i] += _depths[i-1] + _dspace;
-    	}
-		
-		// -- Parameter Access ------------------------------------------------
-		
-		private function params(n:NodeSprite):Params
-		{
-			var p:Params = n.props[PARAMS] as Params;
-			if (p == null) {
-				p = new Params();
-				n.props[PARAMS] = p;
-			}
-			if (p.number == -2) { p.init(n); }
-			return p;
-    	}
-		
-	} // end of class NodeLinkTreeLayout
-
-}
-
-
-import flare.vis.data.NodeSprite;
-
-class Params {
-	public var prelim:Number = 0;
-	public var mod:Number = 0;
-	public var shift:Number = 0;
-	public var change:Number = 0;
-	public var number:int = -2;
-	public var ancestor:NodeSprite = null;
-	public var thread:NodeSprite = null;
-    
-    public function init(item:NodeSprite):void
-    {
-    	ancestor = item;
-    	number = -1;
-    }
-
-	public function clear():void
-	{
-		number = -2;
-		prelim = mod = shift = change = 0;
-		ancestor = thread = null;
-	}
-} // end of class Params
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/layout/Orientation.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/layout/Orientation.as
deleted file mode 100644
index 6713f6a82e..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/layout/Orientation.as
+++ /dev/null
@@ -1,45 +0,0 @@
-package flare.vis.operator.layout
-{
-	/**
-	 * Constants defining layout orientations.
-	 */
-	public class Orientation
-	{
-		/** Constant indicating a left-to-right layout orientation. */
-		public static const LEFT_TO_RIGHT:String = "leftToRight";
-		/** Constant indicating a right-to-left layout orientation. */
-		public static const RIGHT_TO_LEFT:String = "rightToLeft";
-		/** Constant indicating a top-to-bottom layout orientation. */
-		public static const TOP_TO_BOTTOM:String = "topToBottom";
-		/** Constant indicating a bottom-to-top layout orientation. */
-		public static const BOTTOM_TO_TOP:String = "bottomToTop";
-		
-		/**
-		 * This is an abstract class and can not be instantiated.
-		 */
-		public function Orientation() {
-			throw new Error("This is an abstract class.");
-		}
-
-		/**
-		 * Returns true if the input string indicates a vertical orientation.
-		 * @param an orientation string
-		 * @return true if the input string indicates a vertical orientation
-		 */
-		public static function isVertical(orient:String):Boolean
-		{
-			return (orient==TOP_TO_BOTTOM || orient==BOTTOM_TO_TOP);
-		}
-		
-		/**
-		 * Returns true if the input string indicates a horizontal orientation.
-		 * @param an orientation string
-		 * @return true if the input string indicates a horizontal orientation
-		 */
-		public static function isHorizontal(orient:String):Boolean
-		{
-			return (orient==LEFT_TO_RIGHT || orient==RIGHT_TO_LEFT);
-		}
-
-	} // end of class Orientation
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/layout/PieLayout.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/layout/PieLayout.as
deleted file mode 100644
index afadc3cbd4..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/layout/PieLayout.as
+++ /dev/null
@@ -1,94 +0,0 @@
-package flare.vis.operator.layout
-{
-	import flare.animate.Transitioner;
-	import flare.util.Property;
-	import flare.vis.data.Data;
-	import flare.vis.data.DataSprite;
-	
-	import flash.geom.Rectangle;
-	
-	/**
-	 * Layout that places wedges for pie and donut charts.
-	 */
-	public class PieLayout extends Layout
-	{
-		private var _field:Property;
-		private var _radius:Number = NaN;
-		private var _width:Number = -1;
-		private var _a0:Number = Math.PI/2;
-		private var _cw:Boolean = true;
-		private var _t:Transitioner;
-		
-		/** The source property determining wedge size. */
-		public function get source():String { return _field.name; }
-		public function set source(f:String):void { _field = Property.$(f); }
-		
-		/** The radius of the pie/donut chart. If this value is not a number
-		 *  (NaN) the radius will be determined from the layout bounds. */
-		public function get radius():Number { return _radius; }
-		public function set radius(r:Number):void { _radius = r; }
-		
-		/** The width of wedges, negative for a full pie slice. */
-		public function get width():Number { return _width; }
-		public function set width(w:Number):void { _width = w; }
-		
-		/** Flag for clockwise (true) or counter-clockwise (false) layout. */
-		public function get clockwise():Boolean { return _cw; }
-		public function set clockwise(cw:Boolean):void { _cw = cw; }
-		
-		/** The initial angle for the pie layout. */
-		public function get startAngle():Number { return _a0; }
-		public function set startAngle(a:Number):void { _a0 = a; }
-		
-		// --------------------------------------------------------------------
-		
-		/**
-		 * Creates a new PieLayout
-		 * @param field the source data field for determining wedge size
-		 * @param width the radial width of wedges, negative for full slices
-		 */		
-		public function PieLayout(field:String=null, width:Number=-1) {
-			_field = (field==null) ? null : new Property(field);
-			_width = width;
-		}
-		
-		/** @inheritDoc */
-		public override function operate(t:Transitioner=null):void
-		{
-			_t = (t!=null ? t : Transitioner.DEFAULT);
-			hideAxes(_t);
-			
-			var b:Rectangle = layoutBounds;
-			var cx:Number = (b.left + b.right) / 2;
-			var cy:Number = (b.top + b.bottom) / 2;
-			var r:Number = isNaN(_radius) ? Math.min(b.width, b.height)/2 : _radius;
-			var a:Number = _a0, aw:Number;
-			var sum:Number = visualization.data.nodes.stats(_field.name).sum;
-			
-			var o:Object = _t.$(visualization.marks);
-			o.x = cx; o.y = cy;
-			
-			visualization.data.visit(function(d:DataSprite):void {
-				var aw:Number = (_cw?-1:1) * 2*Math.PI * (_field.getValue(d)/sum);
-				var rh:Number = _width * r;
-				var o:Object = _t.$(d);
-				
-				// replaced a/r with x/y zeroes due to Flash rendering errors
-				//o.angle = a + aw/2;    // angular mid-point
-				//o.radius = (r - rh)/2; // radial mid-point
-				o.x = 0;
-				o.y = 0;
-				
-				o.u = a;   // starting angle
-				o.w  = aw; // angular width
-				o.h = r;   // outer radius
-				o.v = rh;  // inner radius
-
-				a += aw;
-			}, Data.NODES);
-			
-			_t = null;
-		}
-		
-	} // end of class PieLayout
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/layout/RadialTreeLayout.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/layout/RadialTreeLayout.as
deleted file mode 100644
index 2f8659e6f7..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/layout/RadialTreeLayout.as
+++ /dev/null
@@ -1,355 +0,0 @@
-package flare.vis.operator.layout
-{
-	import flare.animate.Transitioner;
-	import flare.util.Arrays;
-	import flare.vis.data.NodeSprite;
-	
-	import flash.geom.Rectangle;
-	
-	/**
-	 * Layout that places tree nodes in a radial layout, laying out subsequent
-	 * depth levels of a tree on circles of progressively increasing radius. 
-	 * This layout can be used for both node-link diagrams, where nodes are
-	 * connected by edges, and for radial space-filling ("starburst") diagrams.
-	 * To generate space-filling layouts, nodes should have their shape
-	 * property set to <code>Shapes.WEDGE</code> and the layout instance should
-	 * have the <code>useNodeSize<code> property set to false.
-	 * 
-	 * <p>The algorithm used is an adaptation of a technique by Ka-Ping Yee,
-	 * Danyel Fisher, Rachna Dhamija, and Marti Hearst, published in the paper
-	 * <a href="http://citeseer.ist.psu.edu/448292.html">Animated Exploration of
-	 * Dynamic Graphs with Radial Layout</a>, InfoVis 2001. This algorithm computes
-	 * a radial layout which factors in possible variation in sizes, and maintains
-	 * both orientation and ordering constraints to facilitate smooth and
-	 * understandable transitions between layout configurations.
-	 * </p>
-	 */
-	public class RadialTreeLayout extends Layout
-	{
-		// -- Properties ------------------------------------------------------
-		
-		/** Property name for storing parameters for this layout. */
-		public static const PARAMS:String = "radialTreeLayoutParams";
-		/** The default radius increment between depth levels. */
-		public static const DEFAULT_RADIUS:int = 50;
-	
-	    private var _maxDepth:int = 0;
-	    private var _radiusInc:Number = DEFAULT_RADIUS;
-	    private var _theta1:Number = Math.PI/2;
-	    private var _theta2:Number = Math.PI/2 + 2*Math.PI;
-	    private var _sortAngles:Boolean = true;
-	    private var _setTheta:Boolean = false;
-	    private var _autoScale:Boolean = true;
-	    private var _useNodeSize:Boolean = true;
-	    private var _prevRoot:NodeSprite = null;
-
-		private var _t:Transitioner;
-
-		/** The radius increment between depth levels. */
-		public function get radiusIncrement():Number { return _radiusInc; }
-		public function set radiusIncrement(r:Number):void { _radiusInc = r; }
-		
-		/** Flag determining if nodes should be sorted by angles to help
-		 *  maintain ordering across different spanning-tree configurations.
-		 *  This sorting is important for understandable transitions when using
-		 *  a radial layout of a general graph. However, it is unnecessary for
-		 *  tree structures and increases the running time of layout. */
-		public function get sortAngles():Boolean { return _sortAngles; }
-		public function set sortAngles(b:Boolean):void { _sortAngles = b; }
-		
-		/** Flag indicating if the layout should automatically be scaled to
-		 *  fit within the layout bounds. */
-		public function get autoScale():Boolean { return _autoScale; }
-		public function set autoScale(b:Boolean):void { _autoScale = b; }
-		
-		/** The initial angle for the radial layout. */
-		public function get startAngle():Number { return _theta1; }
-		public function set startAngle(a:Number):void {
-			_theta2 += a - _theta1;
-			_theta1 = a;
-			_setTheta = true;
-		}
-		
-		/** The total angular width the layout should use (2*pi by default).*/
-		public function get angularWidth():Number { return _theta2 - _theta1; }
-		public function set angularWidth(w:Number):void {
-			_theta2 = _theta1 + w;
-			_setTheta = true;
-		}
-
-		/** Flag indicating if node's <code>size</code> property should be
-		 *  used to determine layout spacing. If a space-filling radial
-		 *  layout is desired, this value must be false for the layout
-		 *  to be accurate. */
-		public function get useNodeSize():Boolean { return _useNodeSize; }
-		public function set useNodeSize(b:Boolean):void {
-			_useNodeSize = b;
-		}
-
-		// -- Methods ---------------------------------------------------------
-
-		/**
-		 * Creates a new RadialTreeLayout.
-		 * @param radius the radius increment between depth levels
-		 * @param sortAngles flag indicating if nodes should be sorted by angle
-		 *  to maintain node ordering across spanning-tree configurations
-		 * @param autoScale flag indicating if the layout should automatically
-		 *  be scaled to fit within the layout bounds
-		 */		
-		public function RadialTreeLayout(radius:Number=DEFAULT_RADIUS,
-			sortAngles:Boolean=true, autoScale:Boolean=true)
-		{
-			_radiusInc = radius;
-			_sortAngles = sortAngles;
-			_autoScale = autoScale;
-		}
-
-		/** @inheritDoc */
-		public override function operate(t:Transitioner=null):void
-		{
-			_t = (t!=null ? t : Transitioner.DEFAULT);
-			
-			var n:NodeSprite = layoutRoot as NodeSprite;
-			if (n == null) { _t = null; return; }
-			var np:Params = params(n);
-			
-			// calc relative widths and maximum tree depth
-        	// performs one pass over the tree
-        	_maxDepth = 0;
-        	calcAngularWidth(n, 0);
-			
-			if (_autoScale) setScale(layoutBounds);
-			if (!_setTheta) calcAngularBounds(n);
-			
-			// perform the layout
-	        if (_maxDepth > 0) {
-	        	layout(n, _radiusInc, _theta1, _theta2);
-	        } else if (n.childDegree > 0) {
-	        	n.visitTreeDepthFirst(function(n:NodeSprite):void {
-            		_t.$(n).radius = 0;
-            		_t.$(n).alpha = 0;
-            		_t.$(n).mouseEnabled = false;
-            		if (n.parentEdge != null) {
-            			_t.$(n.parentEdge).alpha = 0;
-            		}
-            	});
-	        }
-	        
-	        // update properties of the root node
-	        np.angle = _theta2 - _theta1;
-	        update(n, 0, 0, np.angle, true);			
-			updateEdgePoints();
-			_t = null;
-		}
-		
-		private function setScale(bounds:Rectangle):void
-		{
-	        var r:Number = Math.min(bounds.width, bounds.height)/2.0;
-	        if (_maxDepth > 0) _radiusInc = r / (_maxDepth+1);
-	    }
-		
-	    /**
-	     * Calculates the angular bounds of the layout, attempting to
-	     * preserve the angular orientation of the display across transitions.
-	     */
-	    private function calcAngularBounds(r:NodeSprite):void
-	    {
-	        if (_prevRoot == null || r == _prevRoot)
-	        {
-	            _prevRoot = r; return;
-	        }
-	        
-	        // try to find previous parent of root
-	        var p:NodeSprite = _prevRoot, pp:NodeSprite;
-	        while (true) {
-	        	pp = p.parentNode;
-	            if (pp == r) {
-	                break;
-	            } else if (pp == null) {
-	                _prevRoot = r;
-	                return;
-	            }
-	            p = pp;
-	        }
-	
-	        // compute offset due to children's angular width
-	        var dt:Number = 0;
-	        
-	        for each (var n:NodeSprite in sortedChildren(r)) {
-	        	if (n == p) break;
-	        	dt += params(n).width;
-	        }
-	        
-	        var rw:Number = params(r).width;
-	        var pw:Number = params(p).width;
-	        dt = -2*Math.PI * (dt+pw/2)/rw;
-	
-	        // set angular bounds
-	        _theta1 = dt + Math.atan2(p.y-r.y, p.x-r.x);
-	        _theta2 = _theta1 + 2*Math.PI;
-	        _prevRoot = r;     
-	    }
-		
-		/**
-	     * Computes relative measures of the angular widths of each
-	     * expanded subtree. Node diameters are taken into account
-	     * to improve space allocation for variable-sized nodes.
-	     * 
-	     * This method also updates the base angle value for nodes 
-	     * to ensure proper ordering of nodes.
-	     */
-	    private function calcAngularWidth(n:NodeSprite, d:int):Number
-	    {
-	        if (d > _maxDepth) _maxDepth = d;       
-	        var aw:Number = 0, diameter:Number = 0;
-	        if (_useNodeSize && d > 0) {
-	        	//diameter = 1;
-	        	diameter = n.expanded && n.childDegree > 0 ? 0 : _t.$(n).size;
-	        } else if (d > 0) {
-	        	var w:Number = n.width, h:Number = n.height;
-	        	diameter = Math.sqrt(w*w+h*h)/d;
-	        	if (isNaN(diameter)) diameter = 0;
-	        }
-
-	        if (n.expanded && n.childDegree > 0) {
-	        	for (var c:NodeSprite=n.firstChildNode; c!=null; c=c.nextNode)
-	        	{
-	        		aw += calcAngularWidth(c, d+1);
-	        	}
-	        	aw = Math.max(diameter, aw);
-	        } else {
-	        	aw = diameter;
-	        }
-			params(n).width = aw;
-	        return aw;
-	    }
-		
-		private static function normalize(angle:Number):Number
-		{
-	        while (angle > 2*Math.PI)
-	            angle -= 2*Math.PI;
-	        while (angle < 0)
-	            angle += 2*Math.PI;
-	        return angle;
-	    }
-	    
-	    private static function minDist(a1:Number, a2:Number):Number
-	    {
-	    	var d1:Number = a2 - a1;
-	    	var d2:Number = Math.abs(d1 - 2*Math.PI);
-	    	var d3:Number = Math.abs(d1 + 2*Math.PI);
-			var dd:Number = Math.min(d1, d2, d3);
-	    	
-	    	if (dd == d1) {
-	    		return a2;
-	    	} else if (dd == d2) {
-	    		return a2 - 2*Math.PI;
-	    	} else {
-	    		return a2 + 2*Math.PI;
-	    	}
-	    }
-
-		private function sortedChildren(n:NodeSprite):Array
-		{
-			var cc:int = n.childDegree;
-			if (cc == 0) return Arrays.EMPTY;
-			var angles:Array = new Array(cc);
-	        
-	        if (_sortAngles) {
-	        	// update base angle for node ordering			
-				var base:Number = -_theta1;
-				var p:NodeSprite = n.parentNode;
-	        	if (p != null) base = normalize(Math.atan2(p.y-n.y, n.x-p.x));
-	        	
-	        	// collect the angles
-	        	var c:NodeSprite = n.firstChildNode;
-		        for (var i:uint=0; i<cc; ++i, c=c.nextNode) {
-		        	angles[i] = normalize(-base + Math.atan2(c.y-n.y,n.x-c.x));
-		        }
-		        // get array of indices, sorted by angle
-		        angles = angles.sort(Array.NUMERIC | Array.RETURNINDEXEDARRAY);
-		        // switch in the actual nodes and return
-		        for (i=0; i<cc; ++i) {
-		        	angles[i] = n.getChildNode(angles[i]);
-		        }
-		    } else {
-		    	for (i=0; i<cc; ++i) {
-		        	angles[i] = n.getChildNode(i);
-		        }
-		    }
-	        
-	        return angles;
-	    }
-		
-		/**
-	     * Compute the layout.
-	     * @param n the root of the current subtree under consideration
-	     * @param r the radius, current distance from the center
-	     * @param theta1 the start (in radians) of this subtree's angular region
-	     * @param theta2 the end (in radians) of this subtree's angular region
-	     */
-	    private function layout(n:NodeSprite, r:Number, theta1:Number, theta2:Number):void
-	    {
-	    	var dtheta:Number = (theta2-theta1);
-	    	var dtheta2:Number = dtheta / 2.0;
-	    	var width:Number = params(n).width;
-	    	var cfrac:Number, nfrac:Number = 0;
-	        
-	        for each (var c:NodeSprite in sortedChildren(n)) {
-	        	var cp:Params = params(c);
-	            cfrac = cp.width / width;
-	            if (c.expanded && c.childDegree > 0)
-	            {
-	                layout(c, r+_radiusInc, theta1 + nfrac*dtheta, 
-	                                        theta1 + (nfrac+cfrac)*dtheta);
-	            }
-	            else if (c.childDegree > 0)
-	            {
-	            	var cr:Number = r + _radiusInc;
-	            	var ca:Number = theta1 + nfrac*dtheta + cfrac*dtheta2;
-	            	
-	            	c.visitTreeDepthFirst(function(n:NodeSprite):void {
-	            		update(n, cr, minDist(n.angle, ca), 0, false);
-	            	});
-	            }
-	            
-	            var a:Number = minDist(c.angle, theta1 + nfrac*dtheta + cfrac*dtheta2);
-	            cp.angle = cfrac * dtheta;
-	            update(c, r, a, cp.angle, true);
-	            nfrac += cfrac;
-	        }
-	    }
-		
-		private function update(n:NodeSprite, r:Number, a:Number,
-								aw:Number, v:Boolean) : void
-		{
-			var o:Object = _t.$(n), alpha:Number = v ? 1 : 0;
-			o.radius = r;
-			o.angle = a;
-			o.h = r + _radiusInc/2;
-			o.v = r - _radiusInc/2;
-			o.w = aw;
-			o.u = a - aw/2;
-			o.alpha = alpha;
-			o.mouseEnabled = v;
-			if (n.parentEdge != null)
-				_t.$(n.parentEdge).alpha = alpha;
-		}
-				
-		private function params(n:NodeSprite):Params
-		{
-			var p:Params = n.props[PARAMS];
-			if (p == null) {
-				p = new Params();
-				n.props[PARAMS] = p;
-			}
-			return p;
-		}
-		
-	} // end of class RadialTreeLayout
-}
-
-class Params {
-	public var width:Number = 0;
-	public var angle:Number = 0;
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/layout/RandomLayout.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/layout/RandomLayout.as
deleted file mode 100644
index 984874c82d..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/layout/RandomLayout.as
+++ /dev/null
@@ -1,24 +0,0 @@
-package flare.vis.operator.layout
-{
-	import flare.animate.Transitioner;
-	import flash.geom.Rectangle;
-	import flare.vis.data.DataSprite;
-	
-	/**
-	 * Layout that places nodes randomly within the layout bounds.
-	 */
-	public class RandomLayout extends Layout
-	{
-		/** @inheritDoc */
-		public override function operate(t:Transitioner=null):void
-		{
-			if (t==null) t = Transitioner.DEFAULT;
-			var r:Rectangle = layoutBounds;
-			visualization.data.nodes.visit(function(d:DataSprite):void {
-				t.$(d).x = r.x + r.width * Math.random();
-				t.$(d).y = r.y + r.height * Math.random();
-			});
-		}
-		
-	} // end of class RandomLayout
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/layout/StackedAreaLayout.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/layout/StackedAreaLayout.as
deleted file mode 100644
index 2bc92bbda0..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/layout/StackedAreaLayout.as
+++ /dev/null
@@ -1,249 +0,0 @@
-package flare.vis.operator.layout
-{
-	import flare.animate.Transitioner;
-	import flash.geom.Rectangle;
-	import flare.vis.data.NodeSprite;
-	import flare.util.Maths;
-	import flare.util.Arrays;
-	import flash.display.Sprite;
-	import flare.vis.scale.LinearScale;
-	import flare.vis.Visualization;
-	import flare.vis.axis.CartesianAxes;
-	import flare.vis.axis.Axis;
-	import flare.vis.scale.QuantitativeScale;
-	import flare.vis.scale.Scale;
-	import flare.vis.scale.Scales;
-	import flare.util.Stats;
-	
-	/**
-	 * Layout that consecutively places items on top of each other. The layout
-	 * currently assumes that each column value is available as separate
-	 * properties of individual DataSprites.
-	 */
-	public class StackedAreaLayout extends Layout
-	{
-		// -- Properties ------------------------------------------------------
-		
-		private var _columns:Array;
-    	private var _baseline:Array;
-    	private var _peaks:Array;
-    	private var _poly:Array;
-		
-		private var _orient:String = Orientation.BOTTOM_TO_TOP;
-		private var _horiz:Boolean = false;
-		private var _top:Boolean = false;
-		private var _initAxes:Boolean = true;
-		
-		private var _normalize:Boolean = false;
-		private var _padding:Number = 0.05;
-		private var _threshold:Number = 1.0;
-		private var _t:Transitioner;
-		
-		private var _scale:QuantitativeScale = new LinearScale(0,0);
-		
-		/** Flag indicating if the visualization should be normalized. */		
-		public function get normalize():Boolean { return _normalize; }
-		public function set normalize(b:Boolean):void { _normalize = b; }
-		
-		/** Flag indicating the padding (as a percentage of the view)
-		 *  that should be reserved within the visualization. */
-		public function get padding():Number { return _padding; }
-		public function set padding(p:Number):void { _padding = p; }
-		
-		/** Threshold value that at least one column value must surpass for
-		 *  a stack to remain visible. */
-		public function get threshold():Number { return _threshold; }
-		public function set threshold(t:Number):void { _threshold = t; }
-		
-		/** The orientation of the layout. */
-		public function get orientation():String { return _orient; }
-		public function set orientation(o:String):void {
-			_orient = o;
-			_horiz = Orientation.isHorizontal(_orient);
-        	_top   = (_orient == Orientation.TOP_TO_BOTTOM ||
-        			  _orient == Orientation.LEFT_TO_RIGHT);
-        	initializeAxes();
-		}
-		
-		/** The scale used to layout the stacked values. */
-		public function get scale():QuantitativeScale { return _scale; }
-		public function set scale(s:QuantitativeScale):void {
-			_scale = s; _scale.dataMin = 0;
-		}
-		
-		// -- Methods ---------------------------------------------------------
-		
-		/**
-		 * Creates a new StackedAreaLayout.
-		 * @param cols an ordered array of properties for the column values
-		 */		
-		public function StackedAreaLayout(cols:Array) {
-			_columns = Arrays.copy(cols);
-			_baseline = new Array(cols.length);
-			_peaks = new Array(cols.length);
-			_poly = new Array(cols.length);
-		}
-		
-		/** @inheritDoc */
-		public override function setup():void
-		{
-			initializeAxes();
-		}
-		
-		/**
-		 * Initializes the axes prior to layout.
-		 */
-		protected function initializeAxes():void
-		{
-			if (!_initAxes || visualization==null) return;
-			
-			var axes:CartesianAxes = super.xyAxes;
-			var axis1:Axis = _horiz ? axes.xAxis : axes.yAxis;
-			var axis2:Axis = _horiz ? axes.yAxis : axes.xAxis;
-			
-			axis1.axisScale = _scale;
-			axis2.showLines = false;
-			axis2.axisScale = Scales.scale(new Stats(_columns));
-			axis2.axisScale.flush = true;
-		}
-		
-		/** @inheritDoc */
-		public override function operate(t:Transitioner=null):void
-		{
-			_t = (t!=null ? t : Transitioner.DEFAULT);
-
-	        // get the orientation specifics sorted out
-	        var bounds:Rectangle = layoutBounds;
-	        var hgt:Number, wth:Number;
-	        var xbias:int, ybias:int, mult:int, len:int;
-	        hgt = (_horiz ? bounds.width : bounds.height);
-	        wth = (_horiz ? -bounds.height : bounds.width);
-	        xbias = (_horiz ? 1 : 0);
-	        ybias = (_horiz ? 0 : 1);
-	        mult = _top ? 1 : -1;
-	        len = _columns.length;
-
-	        // perform first walk to compute max values
-	        var maxValue:Number = peaks();
-	        var minX:Number = _horiz ? bounds.bottom : bounds.left;
-	        var minY:Number = _horiz ? (_top ? bounds.left : bounds.right)
-	                                 : (_top ? bounds.top : bounds.bottom);
-	        Arrays.fill(_baseline, minY);
-	        _scale.dataMax = maxValue;
-	        
-	        // initialize current polygon
-	        var axes:CartesianAxes = super.xyAxes;
-	        var scale:Scale = (_horiz ? axes.yAxis : axes.xAxis).axisScale;
-	        var xx:Number;
-	        for (var j:uint=0; j<len; ++j) {
-				xx = minX + wth * scale.interpolate(_columns[j]);
-	            _poly[2*(len+j)+xbias] = xx;
-	            _poly[2*(len+j)+ybias] = minY;
-	            _poly[2*(len-1-j)+xbias] = xx;
-	            _poly[2*(len-1-j)+ybias] = minY;
-	        }
-	        
-	        // perform second walk to compute polygon layout
-	        visualization.data.nodes.visit(function(d:NodeSprite):void
-	        {
-	        	var obj:Object = t.$(d);
-	        	var height:Number = 0, i:uint;
-	        	var visible:Boolean = d.visible && d.alpha>0;
-	        	var filtered:Boolean = !obj.visible;
-	        	
-	        	// set full polygon to current baseline
-	        	for (i=0; i<len; ++i) {
-	            	_poly[2*(len-1-i)+ybias] = _baseline[i];
-	            }
-	            // if not visible, flatten on current baseline
-	        	if (!visible || filtered) {
-	        		if (!visible || _t.immediate) d.points = Arrays.copy(_poly, d.points);
-	        		else obj.points = Arrays.copy(_poly, d.props.poly);
-	        		return;
-	        	}
-	        	
-	        	// if visible, compute the new heights
-	            for (i=0; i<len; ++i ) {
-	                var base:int = 2*(len+i);
-	                var value:Number = d.data[_columns[i]];
-	                _baseline[i] += mult * hgt * Maths.invLinearInterp(value,0,_peaks[i]);
-	                _poly[base+ybias] = _baseline[i];
-	                height = Math.max(height, Math.abs(
-	                	_poly[2*(len-1-i)+ybias] - _poly[base+ybias]));
-	            }
-	            
-	            // if size is beneath threshold, then hide
-	            if ( height < _threshold ) {
-	            	obj.visible = false;
-	            }
-	            
-	            // update data sprite layout
-	            if (d.points == null)
-	            	d.points = getPolygon(d, bounds);
-	            if (d.props.poly == null)
-	            	d.props.poly = Arrays.copy(_poly);
-	            obj.x = 0;
-	            obj.y = 0;
-	            obj.points = Arrays.copy(_poly, 
-	            	_t.immediate ? d.points : d.props.poly);
-	        });
-			
-			_t = null;
-		}
-		
-		private function peaks():Number
-		{
-			var sum:Number = 0;
-	        
-	        // first, compute max value of the current data
-	        Arrays.fill(_peaks, 0);
-	        visualization.data.nodes.visit(function(d:NodeSprite):void {
-	        	if (!d.visible || d.alpha <= 0 || !_t.$(d).visible)
-	        		return;
-	        	
-	        	for (var i:uint=0; i<_columns.length; ++i) {
-	        		var val:Number = d.data[_columns[i]];
-	        		_peaks[i] += val;
-	        		sum += val;
-	        	}
-	        });
-	        var max:Number = Arrays.max(_peaks);
-	        
-	        // update peaks array as needed
-	        // adjust peaks to include padding space
-	        if (!_normalize) {
-	        	Arrays.fill(_peaks, max);
-	            for (var i:uint=0; i<_peaks.length; ++i) {
-	                _peaks[i] += _padding * _peaks[i];
-	            }
-	            max += _padding*max;
-	        }
-	        
-	        // return max range value
-	        if (_normalize) max = 1.0;
-	        if (isNaN(max)) max = 0;
-	        return max;
-		}
-		
-		private function getPolygon(d:Sprite, b:Rectangle, poly:Array=null):Array
-		{
-			// get oriented
-			var len:uint = _columns.length;
-			var inc:Number = _horiz ? (b.left-b.right) : (b.bottom-b.top);
-			inc /= len-1;
-			var min:Number = _horiz ? (_top ? b.right : b.left)
-									: (_top ? b.top : b.bottom);
-			var bias:int = _horiz ? 1 : 0;
-			
-			// create polygon, populate default values
-			if (poly==null) poly = new Array(4*len);
-			Arrays.fill(poly, min);
-			for (var i:uint=0, x:Number=min; i<len; ++i, x = i*inc+min) {
-				poly[2*(len+1)  +bias] = x;
-				poly[2*(len-1-i)+bias] = x;
-			}
-			return poly;
-		}
-		
-	} // end of class StackedAreaLayout
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/layout/TreeMapLayout.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/layout/TreeMapLayout.as
deleted file mode 100644
index e165398e5c..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/operator/layout/TreeMapLayout.as
+++ /dev/null
@@ -1,265 +0,0 @@
-package flare.vis.operator.layout
-{
-	import flare.animate.Transitioner;
-	import flare.vis.data.NodeSprite;
-	
-	import flash.geom.Rectangle;
-	
-	/**
-	 * Layout that places node in a TreeMap layout that optimizes for low
-	 * aspect ratios of visualized tree nodes. TreeMaps are a form of
-	 * space-filling layout that represents nodes as boxes on the display, with
-	 * children nodes represented as boxes placed within their parent's box.
-	 * This layout determines the area of nodes in the tree map from the
-	 * <code>DataSprite.size</code> property.
-	 * 
-	 * <p>
-	 * This particular algorithm is taken from Bruls, D.M., C. Huizing, and 
-	 * J.J. van Wijk, "Squarified Treemaps" In <i>Data Visualization 2000, 
-	 * Proceedings of the Joint Eurographics and IEEE TCVG Sumposium on 
-	 * Visualization</i>, 2000, pp. 33-42. Available online at:
-	 * <a href="http://www.win.tue.nl/~vanwijk/stm.pdf">
-	 * http://www.win.tue.nl/~vanwijk/stm.pdf</a>.
-	 * </p>
-	 * <p>
-	 * For more information on TreeMaps in general, see 
-	 * <a href="http://www.cs.umd.edu/hcil/treemap-history/">
-	 * http://www.cs.umd.edu/hcil/treemap-history/</a>.
-	 * </p>
-	 */
-	public class TreeMapLayout extends Layout
-	{
-		private static const AREA:String = "treeMapArea";
-		
-		private var _kids:Array = new Array();
-		private var _row:Array  = new Array();
-		private var _r:Rectangle = new Rectangle();
-		
-		private var _t:Transitioner;
-		
-		/** @inheritDoc */
-		public override function operate(t:Transitioner=null):void
-		{
-			_t = (t != null ? t : Transitioner.DEFAULT);
-			
-	        // setup
-	        var root:NodeSprite = layoutRoot as NodeSprite;
-	        var b:Rectangle = layoutBounds;
-	        _r.x=b.x; _r.y=b.y; _r.width=b.width-1; _r.height=b.height-1;
-	        
-	        // process size values
-	        computeAreas(root);
-	        
-	        // layout root node
-	        var o:Object = _t.$(root);
-	        o.x = 0;
-	        o.y = 0;
-	        o.u = _r.x;
-	        o.v = _r.y;
-	        o.w = _r.width;
-	        o.h = _r.height;
-	
-	        // layout the tree
-	        updateArea(root, _r);
-	        layout(root, _r);
-	        
-	        _t = null;
-		}
-		
-	    /**
-    	 * Compute the pixel areas of nodes based on their size values.
-	     */
-	    private function computeAreas(root:NodeSprite):void
-	    {
-	    	var leafCount:int = 0;
-        
-	        // reset all sizes to zero
-	        root.visitTreeDepthFirst(function(n:NodeSprite):void {
-	        	n.props[AREA] = 0;
-	        });
-        
-	        // set raw sizes, compute leaf count
-	        root.visitTreeDepthFirst(function(n:NodeSprite):void {
-	        	if (n.childDegree == 0) {
-	        		var sz:Number = _t.$(n).size;
-	        		n.props[AREA] = sz;
-	        		var p:NodeSprite = n.parentNode;
-	        		for (; p != null; p=p.parentNode)
-	        			p.props[AREA] += sz;
-	        		++leafCount;
-	        	}
-	        });
-        
-	        // scale sizes by display area factor
-	        var b:Rectangle = layoutBounds;
-	        var area:Number = (b.width-1)*(b.height-1);
-	        var scale:Number = area / root.props[AREA];
-	        root.visitTreeDepthFirst(function(n:NodeSprite):void {
-	        	n.props[AREA] *= scale;
-	        });
-	    }
-	    
-	    /**
-	     * Compute the tree map layout.
-	     */
-	    private function layout(p:NodeSprite, r:Rectangle):void
-	    {
-	        // create sorted list of children's properties
-	        for (var i:uint = 0; i < p.childDegree; ++i) {
-	        	_kids.push(p.getChildNode(i).props);
-	        }
-	        _kids.sortOn(AREA, Array.NUMERIC);
-	        // update array to point to sprites, not props
-	        for (i = 0; i < _kids.length; ++i) {
-	        	_kids[i] = _kids[i].self;
-	        }
-	        
-	        // do squarified layout of siblings
-	        var w:Number = Math.min(r.width, r.height);
-	        squarify(_kids, _row, w, r); 
-	        _kids.splice(0, _kids.length); // clear _kids
-	        
-	        // recurse
-	        for (i=0; i<p.childDegree; ++i) {
-	        	var c:NodeSprite = p.getChildNode(i);
-	        	if (c.childDegree > 0) {
-	        		updateArea(c, r);
-	        		layout(c, r);
-	        	}
-	        }
-	    }
-	    
-	    private function updateArea(n:NodeSprite, r:Rectangle):void
-	    {
-	    	var o:Object = _t.$(n);
-			r.x = o.u;
-			r.y = o.v;
-			r.width = o.w;
-			r.height = o.h;
-			return;
-			
-			/*
-	        Rectangle2D b = n.getBounds();
-	        if ( m_frame == 0.0 ) {
-	            // if no framing, simply update bounding rectangle
-	            r.setRect(b);
-	            return;
-	        }
-	        
-	        // compute area loss due to frame
-	        double dA = 2*m_frame*(b.getWidth()+b.getHeight()-2*m_frame);
-	        double A = n.getDouble(AREA) - dA;
-	        
-	        // compute renormalization factor
-	        double s = 0;
-	        Iterator childIter = n.children();
-	        while ( childIter.hasNext() )
-	            s += ((NodeItem)childIter.next()).getDouble(AREA);
-	        double t = A/s;
-	        
-	        // re-normalize children areas
-	        childIter = n.children();
-	        while ( childIter.hasNext() ) {
-	            NodeItem c = (NodeItem)childIter.next();
-	            c.setDouble(AREA, c.getDouble(AREA)*t);
-	        }
-	        
-	        // set bounding rectangle and return
-	        r.setRect(b.getX()+m_frame,       b.getY()+m_frame, 
-	                  b.getWidth()-2*m_frame, b.getHeight()-2*m_frame);
-	        return;
-	        */
-	    }
-	    
-	    private function squarify(c:Array, row:Array, w:Number, r:Rectangle):void
-	    {
-	    	var worst:Number = Number.MAX_VALUE, nworst:Number;
-	    	var len:int;
-	        
-	        while ((len=c.length) > 0) {
-	            // add item to the row list, ignore if negative area
-	            var item:NodeSprite = c[len-1];
-				var a:Number = item.props[AREA];
-	            if (a <= 0.0) {
-	            	c.pop();
-	                continue;
-	            }
-	            row.push(item);
-	            
-	            nworst = getWorst(row, w);
-	            if (nworst <= worst) {
-	            	c.pop();
-	                worst = nworst;
-	            } else {
-	            	row.pop(); // remove the latest addition
-	                r = layoutRow(row, w, r); // layout the current row
-	                w = Math.min(r.width, r.height); // recompute w
-	                row.splice(0, row.length); // clear the row
-	                worst = Number.MAX_VALUE;
-	            }
-	        }
-	        if (row.length > 0) {
-	            r = layoutRow(row, w, r); // layout the current row
-	            row.splice(0, row.length); // clear the row
-	        }
-	    }
-	
-	    private function getWorst(rlist:Array, w:Number):Number
-	    {
-	    	var rmax:Number = Number.MIN_VALUE;
-	    	var rmin:Number = Number.MAX_VALUE;
-	    	var s:Number = 0;
-
-			for each (var n:NodeSprite in rlist) {
-				var r:Number = n.props[AREA];
-				rmin = Math.min(rmin, r);
-				rmax = Math.max(rmax, r);
-				s += r;
-			}
-	        s = s*s; w = w*w;
-	        return Math.max(w*rmax/s, s/(w*rmin));
-	    }
-	    
-	    private function layoutRow(row:Array, ww:Number, r:Rectangle):Rectangle
-	    {
-	    	var s:Number = 0; // sum of row areas
-	        for each (var n:NodeSprite in row) {
-	        	s += n.props[AREA];
-	        }
-			
-			var xx:Number = r.x, yy:Number = r.y, d:Number = 0;
-			var hh:Number = ww==0 ? 0 : s/ww;
-			var horiz:Boolean = (ww == r.width);
-	        
-	        // set node positions and dimensions
-	        for each (n in row) {
-	        	var p:NodeSprite = n.parentNode;
-	        	var nw:Number = n.props[AREA]/hh;
-	        	
-	        	var o:Object = _t.$(n);
-				if (horiz) {
-	        		o.u = xx + d;
-	        		o.v = yy;
-	        		o.w = nw;
-	        		o.h = hh;
-	        	} else {
-	        		o.u = xx;
-	        		o.v = yy + d;
-	        		o.w = hh;
-	        		o.h = nw;
-	        	}
-	        	o.x = 0;
-	        	o.y = 0;
-	        	d += nw;
-	        }
-	        
-	        // update space available in rectangle r
-	        if (horiz) {
-	        	r.x = xx; r.y = yy+hh; r.height -= hh;
-	        } else {
-	        	r.x = xx+hh; r.y = yy; r.width -= hh;
-	        }
-	        return r;
-	    }
-	}
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/palette/ColorPalette.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/palette/ColorPalette.as
deleted file mode 100644
index fe778bd5fa..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/palette/ColorPalette.as
+++ /dev/null
@@ -1,195 +0,0 @@
-package flare.vis.palette
-{
-	import flare.util.Colors;
-	import flare.vis.scale.OrdinalScale;
-	import flare.vis.scale.QuantitativeScale;
-	import flare.vis.scale.Scale;
-	
-	/**
-	 * Palette for color values, including utility methods for generating
-	 * both categorical and ordinal color palettes.
-	 */
-	public class ColorPalette extends Palette
-	{
-		private var _keyframes:Array;
-		
-		/** Keyframes at which color values change in the palette. Useful
-		 *  for configuring gradient paint fills. */
-		public function get keyframes():Array { return _keyframes; }
-		
-		/**
-		 * Creates a new ColorPalette.
-		 * @param colors an array of colors defining the palette
-		 * @param keyframes array of keyframes of color interpolations
-		 */
-		public function ColorPalette(colors:Array=null, keyframes:Array=null) {
-			_values = colors;
-			_keyframes = keyframes;
-		}
-		
-		/**
-		 * Retrieves the color corresponding to input interpolation fraction.
-		 * @param f an interpolation fraction
-		 * @return the color corresponding to the input fraction
-		 */
-		public function getColor(v:Number):uint
-		{
-			if (_values==null || _values.length==0)
-				return 0;
-			return _values[uint(Math.round(v*(_values.length-1)))];
-		}
-		
-		/**
-		 * Retrieves the color corresponding to the input array index.
-		 * @param idx an integer index. The actual index value used is
-		 *  the modulo of the input index by the length of the palette.
-		 * @return the color in the palette at the given index
-		 */
-		public function getColorByIndex(idx:int):uint
-		{
-			if (_values == null || _values.length == 0 || idx < 0)
-				return 0;
-			else
-				return _values[idx % _values.length];
-		}
-		
-		// --------------------------------------------------------------------
-		
-		/**
-		 * Returns a default color palette based on the input scale.
-		 * @param scale the scale of values to map to colors
-		 * @return a default color palette for the input scale
-		 */
-		public static function getDefaultPalette(scale:Scale):ColorPalette
-		{
-			/// TODO: more intelligent color palette selection?
-			
-			if (scale is OrdinalScale)
-			{
-				return category(OrdinalScale(scale).length);
-			}
-			else if (scale is QuantitativeScale)
-			{
-				var qs:QuantitativeScale = QuantitativeScale(scale);				
-				if (qs.dataMin < 0 && qs.dataMax > 0)
-					return diverging();
-			}
-			return ramp();
-		}
-		
-		/** Default size of generated color palettes. */
-		public static const DEFAULT_SIZE:int = 64;
-		/** A set of 10 colors for encoding category values. */
-		public static const CATEGORY_COLORS_10:/*uint*/Array = [
-			0xFF1F77B4, 0xFFFF7F0E, 0xFF2CA02C, 0xFFD62728, 0xFF9467BD,
-			0xFF8C564B, 0xFFE377C2, 0xFF7F7F7F, 0xFFBCBD22, 0xFF17BECF
-		];
-		/** A set of 20 colors for encoding category values. Includes
-		 *  the colors of <code>CATEGORY_COLORS_10</code> plus lighter
-		 *  shades of each. */
-		public static const CATEGORY_COLORS_20:/*uint*/Array = [
-			0xFF1F77B4, 0xFFAEC7E8, 0xFFFF7F0E, 0xFFFFBB78, 0xFF2CA02C,
-			0xFF98DF8A, 0xFFD62728, 0xFFFF9896, 0xFF9467BD, 0xFFC5B0D5,
-			0xFF8C564B, 0xFFC49C94, 0xFFE377C2, 0xFFF7B6D2, 0xFF7F7F7F,
-			0xFFC7C7C7, 0xFFBCBD22, 0xFFDBDB8D, 0xFF17BECF, 0xFF9EDAE5
-		];
-
-		
-		/**
-		 * Generates a categorical color palette
-		 * @param size the number of colors to include
-		 * @param colors an array of category colors to use. If null, a
-		 *  default category color palette will be used.
-		 * @param alpha the alpha value for this palette's colors
-		 * @return the categorical color palette
-		 */
-		public static function category(size:int=20, colors:Array=null,
-										alpha:Number=1.0):ColorPalette
-		{
-			if (colors==null)
-				colors = size<=10 ? CATEGORY_COLORS_10 : CATEGORY_COLORS_20;
-			var a:uint = uint(255 * alpha) % 256;
-			var cm:Array = new Array(size);
-			for (var i:uint=0; i<size; ++i) {
-				cm[i] = Colors.setAlpha(colors[i % colors.length], a);
-			}
-			return new ColorPalette(cm);
-		}
-		
-		/**
-	     * Generates a color palette that uses a "cool", blue-heavy color scheme.
-	     * @param size the size of the color palette
-	     * @return the color palette
-	     */
-	    public static function cool(size:int=DEFAULT_SIZE):ColorPalette
-	    {
-	    	return ramp(0xff00ffff, 0xffff00ff, size);
-	    }
-	
-	    /**
-	     * Generates a color palette that moves from black to red to yellow
-	     * to white.
-	     * @param size the size of the color palette
-	     * @return the color palette
-	     */
-	    public static function hot(size:int=DEFAULT_SIZE):ColorPalette
-	    {
-	        var cm:Array = new Array(size), r:Number, g:Number, b:Number;
-	        var n:int = int(2*size/8);
-	        
-	        for (var i:uint=0; i<size; i++) {
-	            r = i<n ? (i+1)/n : 1;
-	            g = i<n ? 0 : (i<2*n ? (i-n)/n : 1);
-	            b = i<2*n ? 0 : (i-2*n)/(size-2*n);
-	            cm[i] = Colors.rgba(255*r, 255*g, 255*b);
-	        }
-			var f:Number = 1/4;
-	        return new ColorPalette(cm, [0, f, 2*f, 1]);
-	    }
-		
-		/**
-	     * Generates a color palette that "ramps" from one color to another.
-	     * @param min the color corresponding to the minimum scale value
-	     * @param max the color corresponding to the maximum scale value
-	     * @param size the size of the color palette
-	     * @return the color palette
-	     */
-		public static function ramp(min:uint=0xfff1eef6, max:uint=0xff045a8d,
-			size:int=DEFAULT_SIZE):ColorPalette
-		{
-			var cm:Array = new Array(size);
-			for (var i:uint=0; i<size; ++i) {
-				cm[i] = Colors.interpolate(min, max, i/(size-1));
-			}
-			return new ColorPalette(cm, [0,1]);
-		}
-		
-		/**
-	     * Generates a color palette of color ramps diverging from a central
-	     * value.
-	     * @param min the color corresponding to the minimum scale value
-	     * @param mid the color corresponding to the central scale value
-	     * @param max the color corresponding to the maximum scale value
-	     * @param f an interpolation fraction specifying the position of the
-	     *  central value
-	     * @param size the size of the color palette
-	     * @return the color palette
-	     */
-		public static function diverging(min:uint=0xffd73027,
-			mid:uint=0xffffffbf, max:uint=0xff1a9850,
-			f:Number=0.5, size:int=DEFAULT_SIZE):ColorPalette
-		{
-			var cm:Array = new Array(size);
-			var mp:int = int(f*size), i:uint, j:uint;
-			for (i=0; i<mp; ++i) {
-				cm[i] = Colors.interpolate(min, mid, i/mp);
-			}
-			mp = size - mp - 1;
-			for (j=0; i<size; ++i, ++j) {
-				cm[i] = Colors.interpolate(mid, max, j/mp);
-			}
-			return new ColorPalette(cm, [0,f,1]);
-		}
-		
-	} // end of class ColorPalette
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/palette/Palette.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/palette/Palette.as
deleted file mode 100644
index c4904b2aa2..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/palette/Palette.as
+++ /dev/null
@@ -1,42 +0,0 @@
-package flare.vis.palette
-{
-	import mx.core.IMXMLObject;
-	
-	/**
-	 * Base class for palettes, such as color and size palettes, that map from
-	 * interpolated scale values into visual properties
-	 */
-	public class Palette implements IMXMLObject
-	{
-		/** Array of palette values. */
-		protected var _values:Array;
-		
-		/** The number of values in the palette. */
-		public function get size():int { return _values==null ? 0 : _values.length; }
-		/** Array of palette values. */
-		public function get values():Array { return _values; }
-		public function set values(a:Array):void { _values = a; }
-		
-		/**
-		 * Retrieves the palette value corresponding to the input interpolation
-		 * fraction.
-		 * @param f an interpolation fraction
-		 * @return the palette value corresponding to the input fraction
-		 */
-		public function getValue(f:Number):Object
-		{
-			if (_values==null || _values.length==0)
-				return 0;
-			return _values[uint(Math.round(f*(_values.length-1)))];
-		}
-		
-		// -- MXML ------------------------------------------------------------
-		
-		/** @private */
-		public function initialized(document:Object, id:String):void
-		{
-			// do nothing
-		}
-		
-	} // end of class Palette
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/palette/ShapePalette.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/palette/ShapePalette.as
deleted file mode 100644
index 75874d2e63..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/palette/ShapePalette.as
+++ /dev/null
@@ -1,72 +0,0 @@
-package flare.vis.palette
-{
-	import flare.vis.util.graphics.Shapes;
-	
-	/**
-	 * Palette for shape values that maps integer indices to shape drawing
-	 * functions.
-	 * @see flare.vis.util.graphics.Shapes
-	 */
-	public class ShapePalette extends Palette
-	{	
-		/**
-		 * Creates a new, empty ShapePalette.
-		 */
-		public function ShapePalette() {
-			_values = new Array();
-		}	
-		
-		/**
-		 * Adds a shape function to this ShapePalette.
-		 * @param shapeFunc a shape drawing function, following the format of
-		 *  the <code>flare.vis.util.graphics.Shapes</code> class.
-		 */
-		public function addShape(shapeFunc:Function):void
-		{
-			_values.push(shapeFunc);
-		}
-		
-		/**
-		 * Gets the shape function at the given index into the palette.
-		 * @param idx the index of the shape function
-		 * @return the requested shape drawing function
-		 */
-		public function getShape(idx:uint):Function
-		{
-			return _values[idx % _values.length];
-		}
-		
-		/**
-		 * Sets the shape function at the given index into the palette.
-		 * @param idx the index of the shape function
-		 * @param shapeFunc the shape drawing function to set
-		 */
-		public function setShape(idx:uint, shapeFunc:Function):void
-		{
-			_values[idx] = shapeFunc;
-		}
-		
-		/**
-		 * Returns a default shape palette instance. The default palette
-		 * consists of (in order): circle, square, cross, "x", diamond,
-		 * down-triangle, up-triangle, left-triangle, and right-triangle
-		 * shape drawing functions.
-		 * @return the default shape palette
-		 */
-		public static function defaultPalette():ShapePalette
-		{
-			var p:ShapePalette = new ShapePalette();
-			p.addShape(Shapes.circle);
-			p.addShape(Shapes.square);
-			p.addShape(Shapes.cross);
-			p.addShape(Shapes.x);
-			p.addShape(Shapes.diamond);
-			p.addShape(Shapes.triangleDown);
-			p.addShape(Shapes.triangleUp);
-			p.addShape(Shapes.triangleLeft);
-			p.addShape(Shapes.triangleRight);
-			return p;
-		}
-		
-	} // end of class ShapePalette
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/palette/SizePalette.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/palette/SizePalette.as
deleted file mode 100644
index d94cfd6abb..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/palette/SizePalette.as
+++ /dev/null
@@ -1,70 +0,0 @@
-package flare.vis.palette
-{
-	/**
-	 * Palette for size values represeneted as scale factors. The SizePalette
-	 * class distinguishes between 1D and 2D scale factors, with a square
-	 * root being applied to 2D scale factors to ensure that area scales
-	 * linearly with the size value.
-	 */
-	public class SizePalette extends Palette
-	{
-		private var _minSize:Number = 1;
-		private var _range:Number = 6;
-		private var _is2D:Boolean = true;
-		
-		/** The minimum scale factor in this size palette. */
-		public function get minimumSize():Number { return _minSize; }
-		public function set minimumSize(s:Number):void {
-			_range += s - _minSize; _minSize = s;
-		}
-		
-		/** the maximum scale factor in this size palette. */
-		public function get maximumSize():Number { return _minSize + _range; }
-		public function set maximumSize(s:Number):void { _range = s - _minSize; }
-		
-		/** Flag indicating if this size palette is for 2D shapes. */
-		public function get is2D():Boolean { return _is2D; }
-		public function set is2D(b:Boolean):void { _is2D = b; }
-		
-		// --------------------------------------------------------------------
-		
-		/**
-		 * Creates a new SizePalette.
-		 * @param minSize the minimum scale factor in the palette
-		 * @param maxSize the maximum scale factor in the palette
-		 * @param is2D flag indicating if the size values are for a 2D shape,
-		 *  true by default
-		 */		
-		public function SizePalette(minSize:Number=1, maxSize:Number=6, is2D:Boolean=true)
-		{
-			_minSize = minSize;
-			_range = maxSize - minSize;
-			_is2D = is2D;
-		}
-		
-		/** @inheritDoc */
-		public override function getValue(f:Number):Object
-		{
-			return getSize(f);
-		}
-		
-		/**
-		 * Retrieves the size value corresponding to the input interpolation
-		 * fraction. If the <code>is2D</code> flag is true, the square root
-		 * of the size value is returned.
-		 * @param f an interpolation fraction
-		 * @return the size value corresponding to the input fraction
-		 */
-		public function getSize(v:Number):Number
-		{
-			var s:Number;
-			if (_values == null) {
-				s = _minSize + v * _range;
-			} else {
-				s = _values[uint(Math.round(v*(_values.length-1)))];
-			}
-			return _is2D ? Math.sqrt(s) : s;
-		}
-		
-	} // end of class SizePalette
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/scale/IScaleMap.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/scale/IScaleMap.as
deleted file mode 100644
index a2da70395c..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/scale/IScaleMap.as
+++ /dev/null
@@ -1,61 +0,0 @@
-package flare.vis.scale
-{
-	/**
-	 * Interface used by classes which support mapping between
-	 * spatial (x,y) coordinates and values in a data scale. For example,
-	 * both an axis or legend range should provide this functionality.
-	 */
-	public interface IScaleMap
-	{
-		/**
-		 * Returns the x-coordinate corresponding to the lower end of the scale.
-		 * @return the x-coordinate for the minimum value
-		 */
-		function get x1():Number;
-		
-		/**
-		 * Returns the y-coordinate corresponding to the lower end of the scale.
-		 * @return the y-coordinate for the minimum value
-		 */
-		function get y1():Number;
-		
-		/**
-		 * Returns the x-coordinate corresponding to the upper end of the scale.
-		 * @return the x-coordinate for the maximum value
-		 */
-		function get x2():Number;
-		
-		/**
-		 * Returns the y-coordinate corresponding to the upper end of the scale.
-		 * @return the y-coordinate for the maximum value
-		 */
-		function get y2():Number;
-		
-		/**
-		 * Returns the scale value corresponding to a given coordinate.
-		 * @param x the x-coordinate
-		 * @param y the y-coordinate
-		 * @param stayInBounds if true, x,y values outside the current layout
-		 * bounds will be snapped to the bounds. If false, the value lookup
-		 * will attempt to extrapolate beyond the scale bounds. This value
-		 * is true be default.
-		 * @return the scale value corresponding to the given coordinate.
-		 */		
-		function value(x:Number, y:Number, stayInBounds:Boolean=true):Object;
-        
-        /**
-         * Returns the x-coordinate corresponding to the given scale value
-         * @param val the scale value to lookup
-         * @return the x-coordinate at which that scale value is placed
-         */        
-        function X(val:Object):Number;
-        
-        /**
-         * Returns the y-coordinate corresponding to the given scale value
-         * @param val the scale value to lookup
-         * @return the y-coordinate at which that scale value is placed
-         */
-        function Y(val:Object):Number;
-        
-	} // end of interface IScaleMap
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/scale/LinearScale.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/scale/LinearScale.as
deleted file mode 100644
index 026a241a1c..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/scale/LinearScale.as
+++ /dev/null
@@ -1,42 +0,0 @@
-package flare.vis.scale
-{
-	import flare.util.Maths;
-	import flare.util.Strings;
-	
-	/**
-	 * Scale that spaces values linearly along the scale range. This is the
-	 * default scale for numeric types.
-	 */
-	public class LinearScale extends QuantitativeScale
-	{
-		/**
-		 * Creates a new LinearScale.
-		 * @param min the minimum data value
-		 * @param max the maximum data value
-		 * @param base the number base to use
-		 * @param flush the flush flag for scale padding
-		 * @param labelFormat the formatting pattern for value labels
-		 */
-		public function LinearScale(min:Number=0, max:Number=0, base:Number=10,
-			flush:Boolean=false, labelFormat:String=Strings.DEFAULT_NUMBER)
-		{
-			super(min, max, base, flush, labelFormat);
-		}
-		
-		/** @inheritDoc */
-		public override function clone():Scale {
-			return new LinearScale(_dmin, _dmax, _base, _flush, _format);
-		}
-		
-		/** @inheritDoc */
-		protected override function interp(val:Number):Number {
-			return Maths.invLinearInterp(val, _smin, _smax);
-		}
-		
-		/** @inheritDoc */
-		public override function lookup(f:Number):Object {
-			return Maths.linearInterp(f, _smin, _smax);
-		}
-		
-	} // end of class LinearScale
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/scale/LogScale.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/scale/LogScale.as
deleted file mode 100644
index 3f8528dea3..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/scale/LogScale.as
+++ /dev/null
@@ -1,108 +0,0 @@
-package flare.vis.scale
-{
-	import flare.util.Maths;
-	import flare.util.Strings;
-	
-	/**
-	 * Scale that performs a log transformation of the data. The base of the
-	 * logarithm is determined by the <code>base</code> property.
-	 */
-	public class LogScale extends QuantitativeScale
-	{
-		private var _zero:Boolean = false;
-		
-		/**
-		 * Creates a new LogScale.
-		 * @param min the minimum data value
-		 * @param max the maximum data value
-		 * @param base the number base to use
-		 * @param flush the flush flag for scale padding
-		 * @param labelFormat the formatting pattern for value labels
-		 */
-		public function LogScale(min:Number=0, max:Number=0, base:Number=10,
-			flush:Boolean=false, labelFormat:String=Strings.DEFAULT_NUMBER)
-		{
-			super(min, max, base, flush, labelFormat);
-		}
-		
-		/** @inheritDoc */
-		public override function clone():Scale {
-			return new LogScale(_dmin, _dmax, _base, _flush, _format);
-		}
-		
-		/** @inheritDoc */
-		protected override function interp(val:Number):Number {
-			if (_zero) {
-				return Maths.invAdjLogInterp(val, _smin, _smax, _base);
-			} else {
-				return Maths.invLogInterp(val, _smin, _smax, _base);
-			}
-		}
-		
-		/** @inheritDoc */
-		public override function lookup(f:Number):Object
-		{
-			if (_zero) {
-				return Maths.adjLogInterp(f, _smin, _smax, _base);
-			} else {
-				return Maths.logInterp(f, _smin, _smax, _base);
-			}
-		}
-		
-		/** @inheritDoc */
-		protected override function updateScale():void
-		{
-			_zero = (_dmin < 0 && _dmax > 0);
-			if (!_flush) {
-				_smin = Maths.logFloor(_dmin, _base);
-				_smax = Maths.logCeil(_dmax, _base);
-				
-				if (_zero) {
-					if (Math.abs(_dmin) < _base) _smin = Math.floor(_dmin);
-					if (Math.abs(_dmax) < _base) _smax = Math.ceil(_dmax);	
-				}
-			} else {
-				_smin = _dmin;
-				_smax = _dmax;
-			}	
-		}
-		
-		private function log(x:Number):Number {
-			if (_zero) {
-				// distorts the scale to accomodate zero
-				return Maths.adjLog(x, _base);
-			} else {
-				// uses a zero-symmetric logarithmic scale
-				return Maths.symLog(x, _base);
-			}
-		}
-		
-		/** @inheritDoc */
-		public override function values(num:int=-1):Array
-		{
-			var vals:Array = new Array();
-			
-			var beg:int = int(Math.round(log(_smin)));
-			var end:int = int(Math.round(log(_smax)));
-			
-			if (beg == end && beg > 0 && Math.pow(10, beg) > _smin) {
-            	--beg; // decrement to generate more values
-   			}
-   			
-            var i:int, j:int, b:Number, v:Number = _zero?-1:1;
-            for (i = beg; i <= end; ++i)
-            {
-	           	if (i==0 && v<=0) { vals.push(v); vals.push(0); }
-	           	v = _zero && i<0 ? -Math.pow(_base,-i) : Math.pow(_base,i);
-	           	b = _zero && i<0 ? Math.pow(_base,-i-1) : v;
-	            	
-	           	for (j = 1; j < _base; ++j, v += b) {
-	           		if (v > _smax) return vals;
-	           		vals.push(v);
-	           	}
-            }
-            return vals;
-        }
-		
-	} // end of class LogScale
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/scale/OrdinalScale.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/scale/OrdinalScale.as
deleted file mode 100644
index c3a66e58d6..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/scale/OrdinalScale.as
+++ /dev/null
@@ -1,125 +0,0 @@
-package flare.vis.scale
-{
-	import flash.utils.Dictionary;
-	import flare.util.Arrays;
-	
-	/**
-	 * Scale for sequential, ordered data. This supports both numeric and
-	 * non-numeric data, and simply places each element in sequence according
-	 * to an ordering specified by an input data array.
-	 */
-	public class OrdinalScale extends Scale
-	{
-		private var _ordinals:Array;
-		private var _lookup:Dictionary;
-
-		/**
-		 * Creates a new OrdinalScale.
-		 * @param ordinals an ordered array of data values to include in the
-		 *  scale
-		 * @param flush the flush flag for scale padding
-		 * @param copy flag indicating if a copy of the input data array should
-		 *  be made. True by default.
-		 * @param labelFormat the formatting pattern for value labels
-		 */
-		public function OrdinalScale(ordinals:Array=null, flush:Boolean=false,
-			copy:Boolean=true, labelFormat:String=null)
-        {
-        	_ordinals = (ordinals==null ? new Array() :
-        				 copy ? Arrays.copy(ordinals) : ordinals);
-            buildLookup();
-            _flush = flush;
-            _format = labelFormat;
-        }
-        
-        /** @inheritDoc */
-        public override function clone() : Scale
-        {
-        	return new OrdinalScale(_ordinals, _flush, true, _format);
-        }
-        
-		// -- Properties ------------------------------------------------------
-
-		/** The number of distinct values in this scale. */
-		public function get length():int
-		{
-			return _ordinals.length;
-		}
-
-		/** The ordered data array defining this scale. */
-		public function get ordinals():Array
-		{
-			return _ordinals;
-		}
-		public function set ordinals(val:Array):void
-		{
-			_ordinals = val; buildLookup();
-		}
-
-		/**
-		 * Builds a lookup table for mapping values to their indices.
-		 */
-		protected function buildLookup():void
-        {
-        	_lookup = new Dictionary();
-            for (var i:uint = 0; i < _ordinals.length; ++i)
-                _lookup[ordinals[i]] = i;
-        }
-		
-		/** @inheritDoc */
-		public override function get min():Object { return _ordinals[0]; }
-		
-		/** @inheritDoc */
-		public override function get max():Object { return _ordinals[_ordinals.length-1]; }
-		
-		// -- Scale Methods ---------------------------------------------------
-		
-		/**
-		 * Returns the index of the input value in the ordinal array
-		 * @param value the value to lookup
-		 * @return the index of the input value. If the value is not contained
-		 *  in the ordinal array, this method returns -1.
-		 */
-		public function index(value:Object):int
-		{
-			var idx:* = _lookup[value];
-			return (idx==undefined ? -1 : int(idx));
-		}
-		
-		/** @inheritDoc */
-		public override function interpolate(value:Object):Number
-		{
-			if (_ordinals==null || _ordinals.length==0) return 0.5;
-			
-			if (_flush) {
-				return Number(_lookup[value]) / (_ordinals.length-1);
-			} else {
-				return (0.5 + _lookup[value]) / _ordinals.length;
-			}
-		}
-		
-		/** @inheritDoc */
-		public override function lookup(f:Number):Object
-		{
-			if (_flush) {
-				return _ordinals[int(Math.round(f*(_ordinals.length-1)))];
-			} else {
-				f = Math.max(0, Math.min(1, f*_ordinals.length - 0.5));
-				return _ordinals[int(Math.round(f))];
-			}
-		}
-		
-		/** @inheritDoc */
-		public override function values(num:int=-1):Array
-		{
-			var a:Array = new Array();
-			var stride:Number = num<0 ? 1 
-				: Math.max(1, Math.floor(_ordinals.length / num));
-			for (var i:uint = 0; i < _ordinals.length; i += stride) {
-				a.push(_ordinals[i]);
-			}
-			return a;
-		}
-
-	} // end of class OrdinalScale
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/scale/QuantileScale.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/scale/QuantileScale.as
deleted file mode 100644
index 405cc3b94d..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/scale/QuantileScale.as
+++ /dev/null
@@ -1,76 +0,0 @@
-package flare.vis.scale
-{
-	import flare.util.Maths;
-	import flare.util.Strings;
-	
-	/**
-	 * Scale that statistically organizes data by quantiles into discrete bins.
-	 * For example, the quantile scale can be used to create a discrete size
-	 * encoding by statistically dividing the data into bins. Quantiles are
-	 * computed using the <code>flare.util.Maths.quantile</code> method.
-	 * 
-	 * @see flare.util.Maths#quantile
-	 */
-	public class QuantileScale extends Scale
-	{
-		private var _quantiles:Array;
-		
-		/** @inheritDoc */
-		public override function get flush():Boolean { return true; }
-		public override function set flush(val:Boolean):void { /* nothing */ }
-		
-		/** @inheritDoc */
-		public override function get min():Object { return _quantiles[0]; }
-		
-		/** @inheritDoc */
-		public override function get max():Object { return _quantiles[_quantiles.length-1]; }
-		
-		// --------------------------------------------------------------------
-		
-		/**
-		 * Creates a new QuantileScale.
-		 * @param n the number of quantiles desired
-		 * @param values the data values to organized into quantiles
-		 * @param sorted flag indicating if the input values array is
-		 *  already pre-sorted
-		 * @param labelFormat the formatting pattern for value labels
-		 */
-		public function QuantileScale(n:int, values:Array,
-			sorted:Boolean=false, labelFormat:String=Strings.DEFAULT_NUMBER)
-		{
-			_quantiles = (n<0 ? values : Maths.quantile(n, values, !sorted));
-			this.labelFormat = labelFormat;
-		}
-		
-		/** @inheritDoc */
-		public override function clone():Scale
-		{
-			return new QuantileScale(-1, _quantiles, false, _format);
-		}
-		
-		/** @inheritDoc */
-		public override function interpolate(value:Object):Number
-		{
-			return Maths.invQuantileInterp(Number(value), _quantiles);
-		}
-		
-		/** @inheritDoc */
-		public override function lookup(f:Number):Object
-		{
-			return Maths.quantileInterp(f, _quantiles);
-		}
-		
-		/** @inheritDoc */
-		public override function values(num:int=-1):/*Number*/Array
-		{
-			var a:Array = new Array();
-			var stride:int = num<0 ? 1 : 
-				int(Math.max(1, Math.floor(_quantiles.length/num)));
-			for (var i:uint=0; i<_quantiles.length; i += stride) {
-				a.push(_quantiles[i]);
-			}
-			return a;
-		}
-		
-	} // end of class QuantileScale
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/scale/QuantitativeScale.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/scale/QuantitativeScale.as
deleted file mode 100644
index a8ca864cc0..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/scale/QuantitativeScale.as
+++ /dev/null
@@ -1,179 +0,0 @@
-package flare.vis.scale
-{
-	import flare.util.Maths;
-	import flare.util.Strings;
-	
-	/**
-	 * Base class for representing quantiattive numerical data scales.
-	 */
-	public class QuantitativeScale extends Scale
-	{
-		/** The minimum data value. */
-		protected var _dmin:Number;
-		/** The maximum data value. */
-		protected var _dmax:Number;
-		/** The minimum value of the scale range. */
-		protected var _smin:Number;
-		/** The maximum value of the scale range. */
-		protected var _smax:Number;
-		/** The number base of the scale. */
-		protected var _base:Number;
-
-		/**
-		 * Creates a new QuantitativeScale.
-		 * @param min the minimum data value
-		 * @param max the maximum data value
-		 * @param base the number base to use
-		 * @param flush the flush flag for scale padding
-		 * @param labelFormat the formatting pattern for value labels
-		 */
-		public function QuantitativeScale(min:Number=0, max:Number=0, base:Number=10,
-			flush:Boolean=false, labelFormat:String=Strings.DEFAULT_NUMBER)
-		{
-			this.base = base;
-			this.dataMin = min;
-			this.dataMax = max;
-			this.flush = flush;
-			this.labelFormat = labelFormat;
-		}
-
-		/** @inheritDoc */
-		public override function clone() : Scale
-		{
-			throw new Error("This is an abstract class");
-		}
-
-		// -- Properties ------------------------------------------------------
-		
-		/** @inheritDoc */
-		public override function set flush(val:Boolean):void
-		{
-			_flush = val; updateScale();
-		}
-		
-		/** @inheritDoc */
-		public override function get min():Object { return dataMin; }
-		public override function set min(o:Object):void { dataMin = Number(o); }
-		
-		/** @inheritDoc */
-		public override function get max():Object { return dataMax; }
-		public override function set max(o:Object):void { dataMax = Number(o); }
-		
-		/** The minimum data value. This property is the same as the
-		 *  <code>minimum</code> property, but properly typed. */
-		public function get dataMin():Number
-		{
-			return _dmin;
-		}
-		public function set dataMin(val:Number):void
-		{
-			_dmin = val; updateScale();
-		}
-
-		/** The maximum data value. This property is the same as the
-		 *  <code>maximum</code> property, but properly typed. */
-		public function get dataMax():Number
-		{
-			return _dmax;
-		}
-		public function set dataMax(val:Number):void
-		{
-			_dmax = val; updateScale();
-		}
-		
-		/** The minimum value of the scale range. */
-		public function get scaleMin():Number
-		{
-			return _smin;
-		}
-		
-		/** The maximum value of the scale range. */
-		public function get scaleMax():Number
-		{
-			return _smax;
-		}
-		
-		/** The number base used by the scale.
-		 *  By default, base 10 numbers are assumed. */
-		public function get base():Number
-		{
-			return _base;
-		}
-		public function set base(val:Number):void
-		{
-			_base = val;
-		}
-		
-		// -- Scale Methods ---------------------------------------------------
-
-		/**
-		 * Updates the scale range after a change to the data range.
-		 */
-		protected function updateScale():void
-		{
-			if (!_flush) {
-                var step:Number = getStep(_dmin, _dmax);
-                _smin = Math.floor(_dmin / step) * step;
-                _smax = Math.ceil(_dmax / step) * step;
-            } else {
-                _smin = _dmin;
-                _smax = _dmax;
-            }
-		}
-
-		/**
-		 * Returns the default step value between label values. The step is
-		 * computed according to the current number base.
-		 * @param min the minimum scale value
-		 * @param max the maximum scale value
-		 * @return the default step value between label values
-		 */
-		protected function getStep(min:Number, max:Number):Number
-		{
-			var range:Number = max - min;
-			var exp:Number = Math.round(Maths.log(range, _base)) - 1;
-			return Math.pow(base, exp);
-		}
-		
-		/** @inheritDoc */
-		public override function lookup(f:Number):Object
-		{
-			return null;
-		}
-		
-		/** @inheritDoc */
-		public override function interpolate(value:Object):Number
-		{
-			return interp(Number(value));
-		}
-
-		/**
-		 * Returns the interpolation fraction for the given input number.
-		 * @param val the input number
-		 * @return the interpolation fraction for the input value
-		 */
-		protected function interp(val:Number):Number
-		{
-			return -1;
-		}
-		
-		/** @inheritDoc */
-		public override function values(num:int=-1):/*Number*/Array
-		{
-			var a:Array = new Array();
-			var range:Number = _smax - _smin;
-
-			if (range == 0) {
-				a.push(_smin);
-			} else {
-				var step:Number = getStep(_smin, _smax);
-				var stride:Number = num<0 ? 1 : Math.max(1, Math.floor(range/(step*num)));
-				for (var x:Number = _smin; x <= _smax; x += stride*step) {
-					a.push(x);
-				}
-			}
-			return a;
-		}
-
-	} // end of class QuantitativeScale
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/scale/RootScale.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/scale/RootScale.as
deleted file mode 100644
index 5aa468184c..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/scale/RootScale.as
+++ /dev/null
@@ -1,53 +0,0 @@
-package flare.vis.scale
-{
-	import flare.util.Maths;
-	import flare.util.Strings;
-	
-	/**
-	 * Scale that performs a root transformation of the data. This could be a
-	 * square root or any arbitrary power.
-	 */
-	public class RootScale extends QuantitativeScale
-	{
-		private var _pow:Number = 2;
-		
-		/** The power of the root transform. A value of 2 indicates a square
-		 *  root, 3 a cubic root, etc. */
-		public function get power():Number { return _pow; }
-		public function set power(p:Number):void { _pow = p; }
-		
-		/**
-		 * Creates a new RootScale.
-		 * @param min the minimum data value
-		 * @param max the maximum data value
-		 * @param base the number base to use
-		 * @param flush the flush flag for scale padding
-		 * @param labelFormat the formatting pattern for value labels
-		 */
-		public function RootScale(min:Number=0, max:Number=0, base:Number=10,
-								  flush:Boolean=false, pow:Number=2,
-								  labelFormat:String=Strings.DEFAULT_NUMBER)
-		{
-			super(min, max, base, flush, labelFormat);
-			_pow = pow;
-		}
-		
-		/** @inheritDoc */
-		public override function clone():Scale {
-			return new RootScale(_dmin, _dmax, _base, _flush, _pow, _format);
-		}
-		
-		/** @inheritDoc */
-		protected override function interp(val:Number):Number {
-			if (_pow==2) return Maths.invSqrtInterp(val, _smin, _smax);
-			return Maths.invRootInterp(val, _smin, _smax, _pow);
-		}
-		
-		/** @inheritDoc */
-		public override function lookup(f:Number):Object {
-			if (_pow==2) return Maths.sqrtInterp(f, _smin, _smax);
-			return Maths.rootInterp(f, _smin, _smax, _pow);
-		}
-		
-	} // end of class RootScale
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/scale/Scale.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/scale/Scale.as
deleted file mode 100644
index 1a307397f4..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/scale/Scale.as
+++ /dev/null
@@ -1,136 +0,0 @@
-package flare.vis.scale
-{
-	import flare.util.Strings;
-	
-	import mx.core.IMXMLObject;
-	
-	/**
-	 * Base class for all data scale classes that represent a range of
-	 * data values.
-	 */
-	public class Scale implements IMXMLObject
-	{
-		/** Flag indicating if the scale bounds should be flush with the data.
-		 *  False by default, thereby allowing some padding space on the end
-		 *  of the scale. */
-		protected var _flush:Boolean = false;
-		/** Formatting pattern for formatting labels for scale values.
-		 *  @see flare.util.Strings#format */
-		protected var _format:String = null;
-
-		/**
-		 * Flag indicating if the scale bounds should be flush with the data.
-		 * If true, the scale should be flush with the data range, such that
-		 * the min and max values should sit directly on the extremes of the
-		 * scale. If false, the scale should be padded as needed to make the
-		 * scale more readable and human-friendly.
-		 */
-		public function get flush() : Boolean { return _flush; }
-		public function set flush(val:Boolean) : void { _flush = val; }
-
-		/**
-		 * Formatting pattern for formatting labels for scale values.
-		 * For details about the various formatting patterns, see the
-		 * documentation for the <code>Strings.format</code> method.
-		 * @see flare.util.String#format
-		 */
-		public function get labelFormat() : String
-		{
-			return _format==null ? null : _format.substring(3,_format.length-1);
-		}
-		public function set labelFormat(fmt:String) : void
-		{
-			_format = (fmt==null ? fmt : "{0:"+fmt+"}");
-		}
-		
-		/** The minimum data value backing this scale. Note that the actual
-		 *  minimum scale value may be lower if the scale is not flush. */
-		public function get min():Object
-		{
-			throw new Error("Unsupported property");
-		}
-		public function set min(o:Object):void
-		{
-			throw new Error("Unsupported property");
-		}
-		
-		/** The maximum data value backing this scale. Note that the actual
-		 *  maximum scale value may be higher if the scale is not flush. */
-		public function get max():Object
-		{
-			throw new Error("Unsupported property");
-		}
-		public function set max(o:Object):void
-		{
-			throw new Error("Unsupported property");
-		}
-		
-		/**
-		 * Returns a cloned copy of the scale.
-		 * @return a cloned scale.
-		 */
-		public function clone() : Scale
-		{
-			return null;
-		}
-		
-		/**
-		 * Returns an interpolation fraction indicating the position of the input
-		 * value within the scale range.
-		 * @param value a data value for which to return an interpolation
-		 *  fraction along the data scale
-		 * @return the interpolation fraction of the value in the data scale
-		 */
-		public function interpolate(value:Object) : Number
-		{
-			return 0;
-		}
-
-		/**
-		 * Returns a string label representing a value in this scale.
-		 * The labelFormat property determines how the value will be formatted.
-		 * @param value the data value to get the string label for
-		 * @return a string label for the value
-		 */
-		public function label(value:Object) : String
-		{
-			if (_format == null) {
-				return value==null ? "" : value.toString();
-			} else {
-				return Strings.format(_format, value);
-			}
-		}
-
-		/**
-		 * Performs a reverse lookup, returning an object value corresponding
-		 * to a interpolation fraction along the scale range.
-		 * @param f the interpolation fraction
-		 * @return the scale value at the interpolation fraction. May return
-		 *  null if no value corresponds to the input fraction.
-		 */
-		public function lookup(f:Number) : Object
-		{
-			return null;
-		}
-
-		/**
-		 * Returns a set of label values for this scale.
-		 * @param num a desired target number of labels. This parameter is
-		 *  handled idiosyncratically by different scale sub-classes.
-		 * @return an array of label values for the scale
-		 */ 
-		public function values(num:int=-1) : Array
-		{
-			return null;
-		}
-		
-		// -- MXML ------------------------------------------------------------
-		
-		/** @private */
-		public function initialized(document:Object, id:String):void
-		{
-			// do nothing
-		}
-		
-	} // end of class Scale
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/scale/ScaleType.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/scale/ScaleType.as
deleted file mode 100644
index 5854aee29b..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/scale/ScaleType.as
+++ /dev/null
@@ -1,34 +0,0 @@
-package flare.vis.scale
-{
-	/**
-	 * Constants defining known scale types, such as linear, log, and
-	 * time scales.
-	 */
-	public class ScaleType
-	{
-		/** Constant indicating an unknown scale. */
-		public static const UNKNOWN:String = "unknown";
-		/** Constant indicating a categorical scale. */
-		public static const CATEGORIES:String = "categories";
-		/** Constant indicating an ordinal scale. */
-		public static const ORDINAL:String = "ordinal";
-		/** Constant indicating a linear numeric scale. */
-		public static const LINEAR:String = "linear";
-		/** Constant indicating a root-transformed numeric scale. */
-		public static const ROOT:String = "root";
-		/** Constant indicating a log-transformed numeric scale. */
-		public static const LOG:String = "log";
-		/** Constant indicating a quantile scale. */
-		public static const QUANTILE:String = "quantile";
-		/** Constant indicating a date/time scale. */
-		public static const TIME:String = "time";
-		
-		/**
-		 * Constructor, throws an error if called, as this is an abstract class.
-		 */
-		public function ScaleType() {
-			throw new Error("This is an abstract class.");
-		}
-		
-	} // end of class ScaleType
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/scale/Scales.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/scale/Scales.as
deleted file mode 100644
index c0061c836e..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/scale/Scales.as
+++ /dev/null
@@ -1,142 +0,0 @@
-package flare.vis.scale
-{
-	import flare.util.Stats;
-	
-	/**
-	 * Utility class for generating Scale instances.
-	 */
-	public class Scales
-	{
-		/**
-		 * Constructor, throws an error if called, as this is an abstract class.
-		 */
-		public function Scales() {
-			throw new Error("This is an abstract class.");
-		}
-		
-		/**
-		 * Creates a new scale instance based on the input parameters.
-		 * @param stats a <code>Stats</code> object describing a data variable
-		 * @param scaleType the type of scale to create (LINEAR by default).
-		 *  Should be one of ORDINAL, LINEAR, ROOT, LOG, QUANTILE, or TIME.
-		 * @param rest additional arguments dependent on the type of scale. For
-		 *  example, this might be the number of quantiles for a quantile scale
-		 *  or the number base for a logarithmic scale.
-		 */
-		public static function scale(stats:Stats,
-			scaleType:String=null, ...rest):Scale
-		{
-			var arg1:Number, arg2:Number;
-			if (!scaleType) scaleType = ScaleType.LINEAR;
-			
-			switch (stats.dataType) {
-				case Stats.NUMBER:
-					switch (scaleType) {
-						case ScaleType.LINEAR:
-						case ScaleType.UNKNOWN:
-							arg1 = rest.length > 0 ? rest[0] : 10;
-							return linear(stats, arg1);
-						case ScaleType.ROOT:
-							arg1 = rest.length > 0 ? rest[0] : 2;
-							arg2 = rest.length > 1 ? rest[1] : 10;
-							return root(stats, arg1, arg2);
-						case ScaleType.LOG:
-							arg1 = rest.length > 0 ? rest[0] : 10;
-							return log(stats, arg1);
-						case ScaleType.QUANTILE:
-							arg1 = rest.length > 0 ? rest[0] : 5;
-							return quantile(stats, int(arg1));
-						default: return ordinal(stats);
-					}
-				case Stats.DATE:
-					switch (scaleType) {
-						case ScaleType.UNKNOWN:
-						case ScaleType.LINEAR:
-						case ScaleType.TIME:
-							return time(stats);
-						default: return ordinal(stats);
-					}
-				default:
-					return ordinal(stats);
-			}
-		}
-		
-		/**
-		 * Creates a new linear scale according to the input statistics.
-		 * @param stats a <code>Stats</code> object describing a data variable
-		 * @param base the number base to use
-		 * @return a new linear scale
-		 */
-		public static function linear(stats:Stats, base:Number=10):LinearScale
-		{
-			if (stats.dataType != Stats.NUMBER)
-				throw new Error("The data are not numeric!");
-			return new LinearScale(stats.minimum, stats.maximum, base);
-		}
-		
-		/**
-		 * Creates a new root-transformed scale according to the input
-		 * statistics.
-		 * @param stats a <code>Stats</code> object describing a data variable
-		 * @param the exponent of the root transform (2 for square root, 3 for
-		 *  cubic root, etc)
-		 * @param base the number base to use
-		 * @return a new root-transformed scale
-		 */
-		public static function root(stats:Stats, pow:Number=2, base:Number=10):RootScale
-		{
-			if (stats.dataType != Stats.NUMBER)
-				throw new Error("The data are not numeric!");
-			return new RootScale(stats.minimum, stats.maximum, base, false, pow);
-		}
-		
-		/**
-		 * Creates a new loagrithmic scale according to the input statistics.
-		 * @param stats a <code>Stats</code> object describing a data variable
-		 * @param base the logarithm base to use
-		 * @return a new logarithmic scale
-		 */
-		public static function log(stats:Stats, base:Number=10):LogScale
-		{
-			if (stats.dataType != Stats.NUMBER)
-				throw new Error("The data are not numeric!");
-			return new LogScale(stats.minimum, stats.maximum, base);
-		}
-		
-		/**
-		 * Creates a new quantile scale according to the input statistics.
-		 * @param stats a <code>Stats</code> object describing a data variable
-		 * @param n the number of desired quantiles (5 by default)
-		 * @return a new quantile scale
-		 */
-		public static function quantile(stats:Stats, quantiles:int=5):QuantileScale
-		{
-			if (stats.dataType != Stats.NUMBER)
-				throw new Error("The data are not numeric!");
-			return new QuantileScale(quantiles, stats.values, true);
-		}
-		
-		/**
-		 * Creates a new date/time scale according to the input statistics.
-		 * @param stats a <code>Stats</code> object describing a data variable
-		 * @return a new date/time scale
-		 */
-		public static function time(stats:Stats):TimeScale
-		{
-			if (stats.dataType != Stats.DATE)
-				throw new Error("The data are not date-times!");
-			return new TimeScale(stats.minDate, stats.maxDate);
-		}
-		
-		/**
-		 * Creates a new ordinal scale according to the input statistics.
-		 * @param stats a <code>Stats</code> object describing a data variable
-		 * @return a new ordinal scale
-		 */
-		public static function ordinal(stats:Stats):OrdinalScale
-		{
-			return new OrdinalScale(stats.distinctValues, false, false);
-		}
-		
-	} // end of class Scales
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/scale/TimeScale.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/scale/TimeScale.as
deleted file mode 100644
index c416a902a5..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/scale/TimeScale.as
+++ /dev/null
@@ -1,199 +0,0 @@
-package flare.vis.scale
-{
-	import flare.util.Dates;
-	import flare.util.Maths;
-	
-	/**
-	 * Scale for timelines represented using <code>Date</code> values. This
-	 * scale represents a linear, quantitative time line. The class attempts
-	 * to automatically configure date value labels based on the time span
-	 * between the earliest and latest date in the scale. The label formatting
-	 * pattern can also be manually set using the <code>labelFormat</code>
-	 * property.
-	 */
-	public class TimeScale extends Scale
-	{
-		private var _dmin:Date = new Date(0);
-		private var _dmax:Date = new Date(0);
-		private var _smin:Date;
-		private var _smax:Date;
-		private var _autofmt:Boolean = true;
-		
-		/**
-		 * Creates a new TimeScale.
-		 * @param min the minimum (earliest) date value
-		 * @param max the maximum (latest) date value
-		 * @param flush the flush flag for scale padding
-		 * @param labelFormat the formatting pattern for value labels
-		 */
-		public function TimeScale(min:Date=null, max:Date=null,
-			flush:Boolean=false, labelFormat:String=null)
-		{
-			if (min) this.dataMin = min;
-			if (max) this.dataMax = max;
-			this.flush = flush;
-			this.labelFormat = labelFormat;
-		}
-		
-		/** @inheritDoc */
-		public override function clone():Scale {
-			return new TimeScale(_dmin, _dmax, _flush, _format);
-		}
-		
-		// -- Properties ------------------------------------------------------
-		
-		/** @inheritDoc */
-		public override function set flush(val:Boolean):void
-		{
-			_flush = val; updateScale();
-		}
-		
-		/** @inheritDoc */
-		public override function get labelFormat():String
-		{
-			return (_autofmt ? null : super.labelFormat);
-		}
-		
-		public override function set labelFormat(fmt:String):void
-		{
-			if (fmt != null) {
-				super.labelFormat = fmt;
-				_autofmt = false;
-			} else {
-				_autofmt = true;
-				updateScale();
-			}
-		}
-		
-		/** @inheritDoc */
-		public override function get min():Object { return dataMin; }
-		public override function set min(o:Object):void { dataMin = o as Date; }
-		
-		/** @inheritDoc */
-		public override function get max():Object { return dataMax; }
-		public override function set max(o:Object):void { dataMax = o as Date; }
-		
-		/** The minimum (earliest) Date value in the underlying data.
-		 *  This property is the same as the <code>minimum</code>
-		 *  property, but properly typed. */
-		public function get dataMin():Date
-		{
-			return _dmin;
-		}
-		public function set dataMin(val:Date):void
-		{
-			_dmin = val; updateScale();
-		}
-
-		/** The maximum (latest) Date value in the underlying data.
-		 *  This property is the same as the <code>maximum</code>
-		 *  property, but properly typed. */
-		public function get dataMax():Date
-		{
-			return _dmax;
-		}
-		public function set dataMax(val:Date):void
-		{
-			_dmax = val; updateScale();
-		}
-		
-		/** The minimum (earliest) Date value in the scale. */
-		public function get scaleMin():Date
-		{
-			return _smin;
-		}
-		
-		/** The maximum (latest) Date value in the underlying data. */
-		public function get scaleMax():Date
-		{
-			return _smax;
-		}
-		
-		// -- Scale Methods ---------------------------------------------------
-		
-		/** @inheritDoc */
-		public override function interpolate(value:Object):Number
-		{
-			var t:Number = value is Date ? (value as Date).time : Number(value);
-			return Maths.invLinearInterp(t, _smin.time, _smax.time);
-		}
-		
-		/** @inheritDoc */
-		public override function lookup(f:Number):Object
-		{
-			var t:Number = Math.round(Maths.linearInterp(f, _smin.time, _smax.time));
-			return new Date(t);
-		}
-		
-		/**
-		 * Updates the scale range when the data range is changed.
-		 */
-		protected function updateScale():void
-		{
-			var span:int = Dates.timeSpan(_dmin, _dmax);
-			if (_flush) {
-				_smin = _dmin;
-				_smax = _dmax;
-			} else {
-				_smin = Dates.roundTime(_dmin, span, false);
-				_smax = Dates.roundTime(_dmax, span, true);
-			}
-			if (_autofmt) {
-				super.labelFormat = formatString(span);
-			}
-		}
-		
-		/**
-		 * Determines the format string to be used based on a measure of
-		 * the time span covered by this scale.
-		 * @param span the time span covered by this scale. Should use the
-		 *  format of the <code>flare.util.Dates</code> class.
-		 * @return the label formatting pattern
-		 */
-		protected function formatString(span:int):String
-		{
-			if (span >= Dates.YEARS) {
-				return "yyyy";
-			} else if (span == Dates.MONTHS) {
-				return "MMM";
-			} else if (span == Dates.DAYS) {
-				return "d";
-			} else if (span == Dates.HOURS) {
-				return "h:mmt";
-			} else if (span == Dates.MINUTES) {
-				return "h:mmt";
-			} else if (span == Dates.SECONDS) {
-				return "h:mm:ss";
-			} else {
-				return "s.fff";
-			}
-		}
-		
-		/** @inheritDoc */
-		public override function values(num:int=-1):Array
-		{   
-            var a:Array = new Array();
-            var span:int = Dates.timeSpan(_dmin, _dmax);
-            var step:Number = Dates.timeStep(span);
-			var max:Number = _smax.time;
-            var d:Date = _flush ? Dates.roundTime(scaleMin, span, true) : scaleMin;
-
-            if (span < Dates.MONTHS) {
-            	for (var x:Number = _smin.time; x <= max; x += step) {
-            		a.push(new Date(x));
-            	}
-            } else if (span == Dates.MONTHS) {
-            	for (; d.time <= max; d = Dates.addMonths(d,1)) {
-            		a.push(d);
-            	}
-            } else {
-            	var y:int = int(step);
-            	for (; d.time <= max; d = Dates.addYears(d,y)) {
-            		a.push(d);
-            	}
-            }
-			return a;
-		}
-		
-	} // end of class TimeScale
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/util/Filters.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/util/Filters.as
deleted file mode 100644
index 0a5ed621c8..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/util/Filters.as
+++ /dev/null
@@ -1,82 +0,0 @@
-package flare.vis.util
-{
-	import flare.vis.axis.AxisGridLine;
-	import flare.vis.axis.AxisLabel;
-	import flare.vis.data.DataSprite;
-	import flare.vis.data.EdgeSprite;
-	import flare.vis.data.NodeSprite;
-	
-	/**
-	 * Utility class providing a default set of filtering functions. Each
-	 * filtering function returns a boolean value indicating if the input
-	 * argument meets the filtering criterion.
-	 */
-	public class Filters
-	{
-		/**
-		 * Constructor, throws an error if called, as this is an abstract class.
-		 */
-		public function Filters()
-		{
-			throw new Error("This is an abstract class.");
-		}
-		
-		// -- Static Filters --------------------------------------------------
-		
-		/**
-		 * Returns true if the input argument is a <code>DataSprite</code>,
-		 * false otherwise.
-		 * @param x the input value
-		 * @return true if the input is a <code>DataSprite</code>
-		 */
-		public static function isDataSprite(x:Object):Boolean
-		{
-			return x is DataSprite;
-		}
-		
-		/**
-		 * Returns true if the input argument is a <code>NodeSprite</code>,
-		 * false otherwise.
-		 * @param x the input value
-		 * @return true if the input is a <code>NodeSprite</code>
-		 */
-		public static function isNodeSprite(x:Object):Boolean
-		{
-			return x is NodeSprite;
-		}
-		
-		/**
-		 * Returns true if the input argument is an <code>EdgeSprite</code>,
-		 * false otherwise.
-		 * @param x the input value
-		 * @return true if the input is an <code>EdgeSprite</code>
-		 */
-		public static function isEdgeSprite(x:Object):Boolean
-		{
-			return x is EdgeSprite;
-		}
-		
-		/**
-		 * Returns true if the input argument is an <code>AxisLabel</code>,
-		 * false otherwise.
-		 * @param x the input value
-		 * @return true if the input is a <code>AxisLabel</code>
-		 */
-		public static function isAxisLabel(x:Object):Boolean
-		{
-			return x is AxisLabel;
-		}
-		
-		/**
-		 * Returns true if the input argument is an <code>AxisGridLine</code>,
-		 * false otherwise.
-		 * @param x the input value
-		 * @return true if the input is an <code>AxisGridLine</code>
-		 */
-		public static function isAxisGridLine(x:Object):Boolean
-		{
-			return x is AxisGridLine;
-		}
-		
-	} // end of class Filters
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/util/TreeUtil.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/util/TreeUtil.as
deleted file mode 100644
index f69aad3f16..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/util/TreeUtil.as
+++ /dev/null
@@ -1,142 +0,0 @@
-package flare.vis.util
-{
-	import flare.vis.data.Data;
-	import flare.vis.data.EdgeSprite;
-	import flare.vis.data.NodeSprite;
-	import flare.vis.data.Tree;
-	import flare.vis.util.heap.FibonacciHeap;
-	import flare.vis.util.heap.HeapNode;
-	
-	/**
-	 * Utility class for manipulating tree structures, including spanning tree
-	 * generation.
-	 */
-	public class TreeUtil
-	{
-		// -- Breadth First Spanning Tree -------------------------------------
-		
-		/**
-		 * Creates a spanning tree over the input data using
-		 * breadth-first-search from a root node.
-		 * @param n the root node of the tree (must be in the input data)
-		 * @param data the data over which to create the spanning tree
-		 * @return the breadth-first-search spanning tree
-		 */
-		public static function breadthFirstTree(n:NodeSprite, data:Data):Tree
-		{
-			if (n==null) return new Tree();
-			
-			var t:Tree = new Tree(); t.root = n;
-			var q:Array = [n], nn:NodeSprite;
-			while (q.length > 0) {
-				n = q.shift();
-				n.visitEdges(function(e:EdgeSprite):void {
-					nn = e.other(n);
-					if (t.nodes.contains(nn)) return;
-					t.addChildEdge(e);
-					q.push(nn);
-				}, NodeSprite.GRAPH_LINKS);
-			}
-			return t;
-		}
-		
-		
-		// -- Depth First Spanning Tree ---------------------------------------
-		
-		/**
-		 * Creates a spanning tree over the input data using
-		 * depth-first-search from a root node.
-		 * @param n the root node of the tree (must be in the input data)
-		 * @param data the data over which to create the spanning tree
-		 * @return the depth-first-search spanning tree
-		 */
-		public static function depthFirstTree(n:NodeSprite, d:Data):Tree
-		{
-			if (n==null) return new Tree();
-			
-			var t:Tree = new Tree(); t.root = n;
-			depthFirstHelper(n, t);
-			return t;
-		}
-		
-		private static function depthFirstHelper(n:NodeSprite, t:Tree):void
-		{
-			n.visitEdges(function(e:EdgeSprite):void {
-				var nn:NodeSprite = e.other(n);
-				if (t.nodes.contains(nn)) return;
-				t.addChildEdge(e);
-				if (nn.degree > 1) depthFirstHelper(nn, t);
-			}, NodeSprite.GRAPH_LINKS);
-		}
-		
-		
-		// -- Minimum Spanning Tree -------------------------------------------
-		
-		/**
-		 * Given an edge-weighting function, returns a corresponding
-		 * minimum spanning tree builder function.
-		 * @param w an edge-weighting function that returns edge weight values
-		 *  for <code>EdgeSprite</code> input arguments
-		 * @return method closure that wraps the
-		 *  <code>minimumSpanningTree</code> method and calls it using the
-		 *  provided edge-weighting function
-		 */
-		public static function mstBuilder(w:Function):Function
-		{
-			return function(n:NodeSprite, d:Data):Tree {
-				return minimumSpanningTree(n, d, w);
-			}
-		}
-		
-		/**
-		 * Creates a minimum spanning tree over the input data using
-		 * Prim's algorithm.
-		 * @param n the root node of the tree (must be in the input data)
-		 * @param data the data over which to create the spanning tree
-		 * @param w an edge weighting function that returns numeric values
-		 *  for input <code>EdgeSprite</code> values. These edge weights are
-		 *  used to determine the minimum spanning tree.
-		 * @return the minimum spanning tree
-		 */
-		public static function minimumSpanningTree(n:NodeSprite, d:Data, w:Function):Tree
-		{
-			if (n==null) return new Tree();
-			
-			var t:Tree = new Tree(); t.root = n;
-			var hn:HeapNode, weight:Number, e:EdgeSprite;
-			
-			// initialize the heap
-			var heap:FibonacciHeap = new FibonacciHeap();
-			d.nodes.visit(function(nn:NodeSprite):void {
-				nn.props.heapNode = heap.insert(nn, Number.POSITIVE_INFINITY);
-			});
-			heap.decreaseKey(n.props.heapNode, 0);
-			
-			// collect spanning tree edges (Prim's algorithm)
-			while (!heap.empty) {
-				hn = heap.removeMin();
-				n = hn.data as NodeSprite;
-				// add saved tree edge to spanning tree
-				e = n.props.treeEdge as EdgeSprite;
-				if (e != null) t.addChildEdge(e);
-				
-				n.visitEdges(function(e:EdgeSprite):void {
-					var nn:NodeSprite = e.other(n);
-					var hnn:HeapNode = nn.props.heapNode;
-					if (hnn.inHeap && (weight=w(e)) < hnn.key) {
-						nn.props.treeEdge = e; // set tree edge
-						heap.decreaseKey(hnn, weight);
-					}
-				}, NodeSprite.GRAPH_LINKS);
-			}
-			
-			// clean-up and return
-			d.nodes.visit(function(nn:NodeSprite):void {
-				delete nn.props.treeEdge;
-				delete nn.props.heapNode;
-			});
-			return t;
-		}
-				
-	} // end of class TreeUtil
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/util/graphics/Geometry.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/util/graphics/Geometry.as
deleted file mode 100644
index ad53543ddd..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/util/graphics/Geometry.as
+++ /dev/null
@@ -1,191 +0,0 @@
-package flare.vis.util.graphics
-{
-	import flash.geom.Point;
-	
-	/**
-	 * Utility class providing methods for computational geometry.
-	 */
-	public final class Geometry
-	{		
-        /**
-         * Computes the co-efficients for a cubic Bezier curve.
-         * @param a the starting point of the curve
-         * @param b the first control point of the curve
-         * @param c the second control point of the curve
-         * @param d the ending point of the curve
-         * @param c1 point in which to store the zero-order co-efficients
-         * @param c2 point in which to store the first-order co-efficients
-         * @param c3 point in which to store the second-order co-efficients
-         */
-        public static function cubicCoeff(a:Point, b:Point, c:Point, d:Point,
-        								  c1:Point, c2:Point, c3:Point) : void
-        {            
-            c3.x = 3 * (b.x - a.x);
-            c2.x = 3 * (c.x - b.x) - c3.x;
-            c1.x = d.x - a.x - c3.x - c2.x;
-            
-            c3.y = 3 * (b.y - a.y);
-            c2.y = 3 * (c.y - b.y) - c3.y;
-            c1.y = d.y - a.y - c3.y - c2.y;
-        }
-        
-        /**
-         * Computes a point along a cubic Bezier curve.
-         * @param u the interpolation fraction along the curve (between 0 and 1)
-         * @param a the starting point of the curve
-		 * @param c1 the zero-order Bezier co-efficients
-         * @param c2 the first-order Bezier co-efficients
-         * @param c3 the second-order Bezier co-efficients
-         * @param p point in which to store the calculated point on the curve
-         */
-        public static function cubic(u:Number, a:Point, 
-        							 c1:Point, c2:Point, c3:Point,
-        						     p:Point) : Point
-        {
-            p.x = u*(c3.x + u*(c2.x + u*c1.x)) + a.x;
-			p.y = u*(c3.y + u*(c2.y + u*c1.y)) + a.y;
-            return p;
-        }
-        
-        /**
-         * Computes the co-efficients for a B-spline.
-         * @param p the control points of the spline as an array of x,y values
-         * @param a an array for storing the x-components of co-efficients
-         * @param b an array for storing the y-components of co-efficients
-         */
-        public static function bsplineCoeff(p:Array, a:Array, b:Array):void
-        {
-        	a[0] = (-p[0] + 3 * p[2] - 3 * p[4] + p[6]) / 6.0;
-        	a[1] = (3 * p[0] - 6 * p[2] + 3 * p[4]) / 6.0;
-			a[2] = (-3 * p[0] + 3 * p[4]) / 6.0;
-			a[3] = (p[0] + 4 * p[3] + p[4]) / 6.0;
-			
-			b[0] = (-p[1] + 3 * p[3] - 3 * p[5] + p[7]) / 6.0;
-        	b[1] = (3 * p[1] - 6 * p[3] + 3 * p[5]) / 6.0;
-			b[2] = (-3 * p[1] + 3 * p[5]) / 6.0;
-			b[3] = (p[2] + 4 * p[3] + p[5]) / 6.0;
-        }
-        
-        /**
-         * Computes a point along a B-spline.
-         * @param u the interpolation fraction along the curve (between 0 and 1)
-         * @param a an array of x-components of the B-spline co-efficients
-         * @param b an array of y-components of the B-spline co-efficients
-         * @param s point in which to store the calculated point on the curve
-         */
-        public static function bspline(u:Number, a:Array, b:Array, s:Point) : Point
-        {
-			s.x = u*(a[2] + u*(a[1] + u*a[0])) + a[3];
-			s.y = u*(b[2] + u*(b[1] + u*b[0])) + b[3];
-			return s;
-		}
-
-        /**
-         * Computes the convex hull for a set of points.
-         * @param p the input points, as a flat array of x,y values
-         * @param len the number of points to include in the hull
-         * @return the convex hull, as a flat array of x,y values
-         */
-        public static function convexHull(p:Array, len:uint) : Array
-        {
-        	// check arguments
-            if (len < 3)
-            	throw new ArgumentError('Input must have at least 3 points');
-            
-            var pts:Array = new Array(len-1);
-            var stack:Array = new Array(len);
-			var i:uint, j:uint, i0:uint = 0;
-
-            // find the starting ref point: leftmost point with the minimum y coord
-            for (i = 0; i < len; ++i)
-            {
-                if (p[i].Y < p[i0].Y) { 
-                	i0 = i;
-                } else if (p[i].Y == p[i0].Y) {
-                	i0 = (p[i].X < p[i0].X ? i : i0);
-                }
-            }
-
-            // calculate polar angles from ref point and sort
-            for (i = 0, j = 0; i < len; ++i) {
-                if (i != i0) {
-                	pts[j++] = {
-                		angle: Math.atan2(p[i].Y-p[i0].Y, p[i].X-p[i0].X),
-                		index: i
-                	};
-                }
-            }
-            pts.sortOn('angle');
-
-            // toss out duplicated angles
-            var angle:Number = pts[0].angle;
-            var ti:uint = 0, tj:uint = pts[0].index;
-            for (i = 1; i < len-1; i++) {
-                j = pts[i].index;
-                if (angle == pts[i].angle)
-                {
-                    // keep angle corresponding to point most distant from reference point
-                    var d1:Number = Point.distance(p[i0], p[tj]);
-                    var d2:Number = Point.distance(p[i0], p[j]);
-                    
-                    if (d1 >= d2) {
-                        pts[i].index = -1;
-                    } else {
-                        pts[ti].index = -1;
-                        angle = pts[i].angle;
-                        ti = i;
-                        tj = j;
-                    }
-                } else {
-                    angle = pts[i].angle;
-                    ti = i;
-                    tj = j;
-                }
-            }
-
-            // initialize the stack
-            var sp:uint = 0;
-            stack[sp++] = i0;
-            var h:uint = 0;
-            for (var k:uint = 0; k < 2; h++) {
-                if (pts[h].index != -1) {
-                    stack[sp++] = pts[h].index;
-                    k++;
-                }
-            }
-
-            // do graham's scan
-            for (; h < len-1; h++)
-            {
-                if (pts[h].index == -1) continue; // skip tossed out points
-                while (isNonLeft(i0, stack[sp-2], stack[sp-1], pts[h].index, p))
-                    sp--;
-                stack[sp++] = pts[h].index;
-            }
-
-            // construct the hull
-            var hull:Array = new Array(sp);
-            for (i = 0; i < sp; ++i) {
-                hull[i] = p[stack[i]];
-            }
-            return hull;
-        }
-
-        private static function isNonLeft(i0:uint, i1:uint, i2:uint, i3:uint, p:Array) : Boolean
-        {
-            var l1:Number, l2:Number, l4:Number, l5:Number, l6:Number, a:Number, b:Number;
-
-            a = p[i2].y - p[i1].y; b = p[i2].x - p[i1].y; l1 = Math.sqrt(a * a + b * b);
-            a = p[i3].y - p[i2].y; b = p[i3].x - p[i2].y; l2 = Math.sqrt(a * a + b * b);
-            a = p[i3].y - p[i0].y; b = p[i3].x - p[i0].y; l4 = Math.sqrt(a * a + b * b);
-            a = p[i1].y - p[i0].y; b = p[i1].x - p[i0].y; l5 = Math.sqrt(a * a + b * b);
-            a = p[i2].y - p[i0].y; b = p[i2].x - p[i0].y; l6 = Math.sqrt(a * a + b * b);
-            
-            a = Math.acos((l2*l2 + l6*l6 - l4*l4) / (2*l2*l6));
-            b = Math.acos((l6*l6 + l1*l1 - l5*l5) / (2*l6*l1));
-
-            return (Math.PI - a - b < 0);
-        }
-		
-	} // end of class Geometry
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/util/graphics/GraphicsUtil.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/util/graphics/GraphicsUtil.as
deleted file mode 100644
index c1eb612cbc..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/util/graphics/GraphicsUtil.as
+++ /dev/null
@@ -1,303 +0,0 @@
-package flare.vis.util.graphics
-{
-	import flash.display.Graphics;
-	import flash.geom.Point;
-	
-	/**
-	 * Utility class providing graphics drawing routines.
-	 */
-	public class GraphicsUtil
-	{
-		// temp variables
-		private static var _p1:Point = new Point();
-		private static var _p2:Point = new Point();
-		private static var _p3:Point = new Point();
-		private static var _p4:Point = new Point();
-		private static var _c1:Point = new Point();
-		private static var _c2:Point = new Point();
-		private static var _c3:Point = new Point();
-		
-		/**
-		 * Draws an arc (a segment of a circle's circumference)
-		 * @param g the graphics context to draw with
-		 * @param x the center x-coordinate of the arc
-		 * @param y the center y-coorindate of the arc
-		 * @param radius the radius of the arc
-		 * @param a0 the starting angle of the arc (in radians)
-		 * @param a1 the ending angle of the arc (in radians)
-		 */
-		public static function drawArc(g:Graphics, x:Number, y:Number, 
-									radius:Number, a0:Number, a1:Number) : void
-		{
-			var slices:Number = (Math.abs(a1-a0) * radius) / 4;
-			var a:Number, cx:Number = x, cy:Number = y;
-			
-			for (var i:uint = 0; i <= slices; ++i) {
-				a = a0 + i*(a1-a0)/slices;
-				x = cx + radius * Math.cos(a);
-				y = cy + -radius * Math.sin(a);
-				if (i==0) {
-					g.moveTo(x, y);
-				} else {
-					g.lineTo(x,y);
-				}
-			}
-		}
-		
-		/**
-		 * Draws a wedge defined by an angular range and inner and outer radii.
-		 * An inner radius of zero results in a pie-slice shape.
-		 * @param g the graphics context to draw with
-		 * @param x the center x-coordinate of the wedge
-		 * @param y the center y-coorindate of the wedge
-		 * @param outer the outer radius of the wedge
-		 * @param inner the inner radius of the wedge
-		 * @param a0 the starting angle of the wedge (in radians)
-		 * @param a1 the ending angle of the wedge (in radians)
-		 */
-		public static function drawWedge(g:Graphics, x:Number, y:Number, 
-			outer:Number, inner:Number, a0:Number, a1:Number) : void
-		{
-			var a:Number = Math.abs(a1-a0);
-			var slices:int = Math.max(4, int(a * outer / 6));
-			var cx:Number = x, cy:Number = y, x0:Number, y0:Number;
-			var circle:Boolean = (a >= 2*Math.PI);
-
-			
-			if (slices <= 0) return;
-		
-			// pick starting point
-			if (inner <= 0 && !circle) {
-				g.moveTo(cx, cy);
-			} else {
-				x0 = cx + outer * Math.cos(a0);
-				y0 = cy + -outer * Math.sin(a0);
-				g.moveTo(x0, y0);
-			}
-			
-			// draw outer arc
-			for (var i:uint = 0; i <= slices; ++i) {
-				a = a0 + i*(a1-a0)/slices;
-				x = cx + outer * Math.cos(a);
-				y = cy + -outer * Math.sin(a);
-				g.lineTo(x,y);
-			}
-
-			if (circle) {
-				// return to starting point
-				g.lineTo(x0, y0);
-			} else if (inner > 0) {
-				// draw inner arc
-				for (i = slices+1; --i >= 0;) {
-					a = a0 + i*(a1-a0)/slices;
-					x = cx + inner * Math.cos(a);
-					y = cy + -inner * Math.sin(a);
-					g.lineTo(x,y);
-				}
-				g.lineTo(x0, y0);
-			} else {
-				// return to center
-				g.lineTo(cx, cy);
-			}
-		}
-		
-		/**
-		 * Draws a polygon shape.
-		 * @param g the graphics context to draw with
-		 * @param a a flat array of x, y values defining the polygon
-		 */
-		public static function drawPolygon(g:Graphics, a:Array) : void
-		{
-			g.moveTo(a[0], a[1]);
-			for (var i:uint=2; i<a.length; i+=2) {
-				g.lineTo(a[i], a[i+1]);
-			}
-			g.lineTo(a[0], a[1]);
-		}
-		
-		/**
-		 * Draws a cubic Bezier curve.
-		 * @param g the graphics context to draw with
-		 * @param ax x-coordinate of the starting point
-		 * @param ay y-coordinate of the starting point
-		 * @param bx x-coordinate of the first control point
-		 * @param by y-coordinate of the first control point
-		 * @param cx x-coordinate of the second control point
-		 * @param cy y-coordinate of the second control point
-		 * @param dx x-coordinate of the ending point
-		 * @param dy y-coordinate of the ending point
-		 * @param move if true (the default), the graphics context will be
-		 *  moved to the starting point before drawing starts. If false,
-		 *  no move command will be issued; this is useful when connecting
-		 *  multiple curves to define a filled region.
-		 */
-		public static function drawCubic(g:Graphics, ax:Number, ay:Number,
-			bx:Number, by:Number, cx:Number, cy:Number, dx:Number, dy:Number,
-			move:Boolean=true) : void
-		{			
-			var subdiv:Number, u:Number, xx:Number, yy:Number
-			_p1.x = ax; _p1.y = ay;
-			_p2.x = bx; _p2.y = by;
-			_p3.x = cx; _p3.y = cy;
-			_p4.x = dx; _p4.y = dy;
-			
-			// determine number of line segments
-			subdiv = Math.sqrt((xx=(bx-ax))*xx + (yy=(by-ay))*yy) +
-					 Math.sqrt((xx=(cx-bx))*xx + (yy=(cy-by))*yy) +
-					 Math.sqrt((xx=(dx-cx))*xx + (yy=(dy-cy))*yy);
-			subdiv = Math.floor(subdiv/4);
-			
-			Geometry.cubicCoeff(_p1, _p2, _p3, _p4, _c1, _c2, _c3);
-			
-			if (move) g.moveTo(ax, ay);
-			for (var i:uint=0; i<=subdiv; ++i) {
-				u = i/subdiv;
-				Geometry.cubic(u, _p1, _c1, _c2, _c3, _p2);
-				g.lineTo(_p2.x, _p2.y);
-			}
-		}
-		
-		/**
-		 * Draws a cardinal spline composed of piecewise connected cubic
-		 * Bezier curves. Curve control points are inferred so as to ensure
-		 * C1 continuity (continuous derivative).
-		 * @param g the graphics context to draw with
-		 * @param p an array defining a polygon or polyline to render with a
-		 *  cardinal spline
-		 * @param s a tension parameter determining the spline's "tightness"
-		 * @param closed indicates if the cardinal spline should be a closed
-		 *  shapes. False by default.
-		 */
-		public static function drawCardinal(g:Graphics, p:Array, s:Number=0.15, closed:Boolean=false) : void
-		{
-			// compute the size of the path
-	        var len:uint = p.length;
-	        
-	        if (len < 2)
-	            throw new Error("Cardinal splines require at least 3 points");
-	        
-	        var dx1:Number, dy1:Number, dx2:Number, dy2:Number;
-	        g.moveTo(p[0], p[1]);
-	        
-	        // compute first control points
-	        if (closed) {
-	            dx1 = p[2]-p[len-2];
-	            dy1 = p[3]-p[len-1];
-	        } else {
-	            dx1 = p[4]-p[0]
-	            dy1 = p[5]-p[1];
-	        }
-
-	        // iterate through control points
-	        var i:uint = 0;
-	        for (i=2; i<len-2; i+=2) {
-	            dx1 = dx2; dy1 = dy2;
-	            dx2 = p[i+2] - p[i-2];
-	            dy2 = p[i+3] - p[i-1];
-	            
-	            drawCubic(g, p[i-2],    p[i-1],
-						     p[i-2]+s*dx1, p[i-1]+s*dy1,
-	                         p[i]  -s*dx2, p[i+1]-s*dy2,
-	                         p[i],         p[i+1]);
-	        }
-	        
-	        // finish spline
-	        if (closed) {
-	            dx1 = dx2; dy1 = dy2;
-	            dx2 = p[0] - p[i-2];
-	            dy2 = p[1] - p[i-1];
-	            drawCubic(g, p[i-2], p[i-1], p[i-2]+s*dx1, p[i-1]+s*dy1,
-	            			 p[i]-s*dx2, p[i+1]-s*dy2, p[i], p[i+1], false);
-	            
-	            dx1 = dx2; dy1 = dy2;
-	            dx2 = p[2] - p[len-2];
-	            dy2 = p[3] - p[len-1];
-	            drawCubic(g, p[len-2], p[len-1], p[len-2]+s*dx1, p[len-1]+s*dy1,
-	            	p[0]-s*dx2, p[1]-s*dy2, p[0], p[1], false);
-	        } else {
-	        	drawCubic(g, p[i-2], p[i-1], p[i-2]+s*dx1, p[i-1]+s*dy1,
-	        		p[i]-s*dx2, p[i+1]-s*dy2, p[i], p[i+1], false);
-	        }
-		}
-		
-		/**
-		 * Draws a cardinal spline composed of piecewise connected cubic
-		 * Bezier curves. Curve control points are inferred so as to ensure
-		 * C1 continuity (continuous derivative).
-		 * @param g the graphics context to draw with
-		 * @param ax the x-coordinate of the starting point
-		 * @param ay the y-coordinate of the starting point
-		 * @param p an array defining a polygon or polyline to render with a
-		 *  cardinal spline, excluding starting and ending points
-		 * @param bx the x-coordinate of the ending point
-		 * @param by the y-coordinate of the ending point
-		 * @param s a tension parameter determining the spline's "tightness"
-		 * @param closed indicates if the cardinal spline should be a closed
-		 *  shapes. False by default.
-		 */
-		public static function drawCardinal2(g:Graphics, ax:Number, ay:Number,
-			pts:Array, bx:Number, by:Number, s:Number=0.15, closed:Boolean=false) : void
-		{
-			// compute the size of the path
-	        var len:uint = pts.length;
-	        
-	        if (len < 2)
-	            throw new Error("Cardinal splines require at least 3 points");
-	        
-	        var dx1:Number, dy1:Number, dx2:Number, dy2:Number;
-	        g.moveTo(ax, ay);
-	        
-	        // compute first control points
-	        if (closed) {
-	            dx1 = pts[0]-bx;
-	            dy1 = pts[1]-by;
-	        } else {
-	            dx1 = pts[2]-ax;
-	            dy1 = pts[3]-ay;
-	        }
-	        
-	        // draw first curve
-	        dx2 = pts[2] - ax;
-	        dy2 = pts[3] - ay;
-	        drawCubic(g, ax, ay, ax+s*dx1, ay+s*dy1, pts[0]-s*dx2, pts[1]-s*dy2, pts[0], pts[1], false);
-
-	        // iterate through control points
-	        var i:uint = 0;
-	        for ( i=2; i<len-2; i+=2 ) {
-	            dx1 = dx2; dy1 = dy2;
-	            dx2 = pts[i+2]-pts[i-2];
-	            dy2 = pts[i+3]-pts[i-1];
-	            
-	            drawCubic(g, pts[i-2],    pts[i-1],
-						  pts[i-2]+s*dx1, pts[i-1]+s*dy1,
-	                      pts[i]  -s*dx2, pts[i+1]-s*dy2,
-	                      pts[i],         pts[i+1]);
-	        }
-	        
-	        // draw second-to-last curve
-	        dx1 = dx2; dy1 = dy2;
-	        dx2 = bx - pts[len-4];
-	        dy2 = by - pts[len-3];
-	        drawCubic(g, pts[len-4], pts[len-3], pts[len-4]+s*dx1, pts[len-3]+s*dy1,
-	        			 pts[len-2]-s*dx2, pts[len-1]-s*dy2, pts[len-2], pts[len-1], false);
-	        
-	        // finish spline
-	        if (closed) {
-	            dx1 = dx2; dy1 = dy2;
-	            dx2 = ax - pts[len-2];
-	            dy2 = ay - pts[len-1];
-	            drawCubic(g, pts[len-2], pts[len-1], pts[len-2]+s*dx1, pts[len-1]+s*dy1,
-	            			 bx-s*dx2, by-s*dy2, bx, by, false);
-	            
-	            dx1 = dx2; dy1 = dy2;
-	            dx2 = pts[0]-bx;
-	            dy2 = pts[1]-by;
-	            drawCubic(g, bx, by, bx+s*dx1, by+s*dy1, ax-s*dx2, ay-s*dy2, ax, ay, false);
-	        } else {
-	        	drawCubic(g, pts[len-2], pts[len-1], pts[len-2]+s*dx1, pts[len-1]+s*dy1,
-	        				 bx-s*dx2, by-s*dy2, bx, by, false);
-	        }
-		}
-		
-	} // end of class GraphicsUtil
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/util/graphics/Shapes.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/util/graphics/Shapes.as
deleted file mode 100644
index 4d1ca1e289..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/util/graphics/Shapes.as
+++ /dev/null
@@ -1,155 +0,0 @@
-package flare.vis.util.graphics
-{
-	import flash.display.Graphics;
-	
-	/**
-	 * Utility class defining shape types and shape drawing routines. All shape
-	 * drawing functions take two arguments: a <code>Graphics</code> context
-	 * to draw with and a size parameter determining the radius of the shape
-	 * (i.e., the height and width of the shape are twice the size parameter).
-	 */
-	public class Shapes
-	{
-		/** Constant indicating a straight line shape. */
-		public static const LINE:uint = 0;
-		/** Constant indicating a Bezier curve. */
-		public static const BEZIER:uint = 1;
-		/** Constant indicating a cardinal spline. */
-		public static const CARDINAL:uint = 2;
-		
-		/** Constant indicating a rectangular block shape. */
-		public static const BLOCK:int = -1;
-		/** Constant indicating a polygon shape. */
-		public static const POLYGON:int = -2;
-		/** Constant indicating a "polyblob" shape, a polygon whose
-		 *  edges are interpolated with a cardinal spline. */
-		public static const POLYBLOB:int = -3;
-		/** Constant indicating a vertical bar shape. */
-		public static const VERTICAL_BAR:int = -4;
-		/** Constant indicating a horizontal bar shape. */
-		public static const HORIZONTAL_BAR:int = -5;
-		/** Constant indicating a wedge shape. */
-		public static const WEDGE:int = -6;
-		
-		/**
-		 * Draws a circle shape.
-		 * @param g the graphics context to draw with
-		 * @param size the radius of the circle
-		 */
-		public static function circle(g:Graphics, size:Number):void
-		{
-			g.drawCircle(0, 0, size);
-		}
-		
-		/**
-		 * Draws a square shape.
-		 * @param g the graphics context to draw with
-		 * @param size the (half-)size of the square. The height and width of
-		 *  the shape will both be exactly twice the size parameter.
-		 */
-		public static function square(g:Graphics, size:Number):void
-		{
-			g.drawRect(-size, -size, 2*size, 2*size);
-		}
-		
-		/**
-		 * Draws a cross shape.
-		 * @param g the graphics context to draw with
-		 * @param size the (half-)size of the cross. The height and width of
-		 *  the shape will both be exactly twice the size parameter.
-		 */
-		public static function cross(g:Graphics, size:Number):void
-		{
-			g.moveTo(0, -size);
-			g.lineTo(0, size);
-			g.moveTo(-size, 0);
-			g.lineTo(size, 0);
-		}
-		
-		/**
-		 * Draws an "x" shape.
-		 * @param g the graphics context to draw with
-		 * @param size the (half-)size of the "x". The height and width of
-		 *  the shape will both be exactly twice the size parameter.
-		 */
-		public static function x(g:Graphics, size:Number):void
-		{
-			g.moveTo(-size, -size);
-			g.lineTo(size, size);
-			g.moveTo(size, -size);
-			g.lineTo(-size, size);
-		}
-		
-		/**
-		 * Draws a diamond shape.
-		 * @param g the graphics context to draw with
-		 * @param size the (half-)size of the diamond. The height and width of
-		 *  the shape will both be exactly twice the size parameter.
-		 */
-		public static function diamond(g:Graphics, size:Number):void
-		{
-			g.moveTo(0, size);
-			g.lineTo(-size, 0);
-			g.lineTo(0, -size);
-			g.lineTo(size, 0);
-			g.lineTo(0, size);	
-		}
-		
-		/**
-		 * Draws an upward-pointing triangle shape.
-		 * @param g the graphics context to draw with
-		 * @param size the (half-)size of the triangle. The height and width of
-		 *  the shape will both be exactly twice the size parameter.
-		 */
-		public static function triangleUp(g:Graphics, size:Number):void
-		{
-			g.moveTo(-size, size);
-			g.lineTo(size, size);
-			g.lineTo(0, -size);
-			g.lineTo(-size, size);
-		}
-		
-		/**
-		 * Draws a downward-pointing triangle shape.
-		 * @param g the graphics context to draw with
-		 * @param size the (half-)size of the triangle. The height and width of
-		 *  the shape will both be exactly twice the size parameter.
-		 */
-		public static function triangleDown(g:Graphics, size:Number):void
-		{
-			g.moveTo(-size, -size);
-			g.lineTo(size, -size);
-			g.lineTo(0, size);
-			g.lineTo(-size, -size);
-		}
-		
-		/**
-		 * Draws a right-pointing triangle shape.
-		 * @param g the graphics context to draw with
-		 * @param size the (half-)size of the triangle. The height and width of
-		 *  the shape will both be exactly twice the size parameter.
-		 */
-		public static function triangleRight(g:Graphics, size:Number):void
-		{
-			g.moveTo(-size, -size);
-			g.lineTo(size, 0);
-			g.lineTo(-size, size);
-			g.lineTo(-size, -size);
-		}
-		
-		/**
-		 * Draws a left-pointing triangle shape.
-		 * @param g the graphics context to draw with
-		 * @param size the (half-)size of the triangle. The height and width of
-		 *  the shape will both be exactly twice the size parameter.
-		 */
-		public static function triangleLeft(g:Graphics, size:Number):void
-		{
-			g.moveTo(size, -size);
-			g.lineTo(-size, 0);
-			g.lineTo(size, size);
-			g.lineTo(size, -size);
-		}
-		
-	} // end of class Shapes
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/util/graphics/Transforms.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/util/graphics/Transforms.as
deleted file mode 100644
index 0cf033db62..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/util/graphics/Transforms.as
+++ /dev/null
@@ -1,152 +0,0 @@
-package flare.vis.util.graphics
-{
-	import flare.animate.Transitioner;
-	import flash.display.DisplayObject;
-	import flash.geom.Point;
-	import flash.geom.Matrix;
-	
-	/**
-	 * Utility class providing methods for perfoming camera transformas. These
-	 * methods update the transformation matrix of a display object to simulate
-	 * pan, zoom, and rotate camera movements. When used on a container, these
-	 * operations will correspondingly pan, zoom, and rotate the contents of
-	 * the container.
-	 */
-	public class Transforms
-	{
-		private static var _point:Point = new Point();
-		
-		/**
-		 * Constructor, throws an error if called, as this is an abstract class.
-		 */
-		public function Transforms()
-		{
-			throw new Error("This is an abstract class.");
-		}
-		
-		/**
-		 * Performs a pan (translation) on an input matrix.
-		 * The result is a transformation matrix including the translation.
-		 * @param mat an input transformation matrix
-		 * @param dx the change in x position
-		 * @param dy the change in y position
-		 * @return the resulting, panned transformation matrix
-		 */
-		public static function panMatrixBy(mat:Matrix, dx:Number, dy:Number):Matrix
-		{
-			mat.translate(dx, dy);
-			return mat;
-		}
-		
-		/**
-		 * Performs a zoom about a specific point on an input matrix.
-		 * The result is a transformation matrix including the zoom.
-		 * @param mat an input transformation matrix
-		 * @param scale a scale factor specifying the amount to zoom. A value
-		 *  of 2 will zoom in such that objects are twice as large. A value of
-		 *  0.5 will zoom out such that objects are half the size.
-		 * @param p the point about which to zoom in or out
-		 * @return the resulting, zoomed transformation matrix
-		 */
-		public static function zoomMatrixBy(mat:Matrix, scale:Number, p:Point):Matrix
-		{
-			mat.translate(-p.x, -p.y);
-			mat.scale(scale, scale);
-			mat.translate(p.x, p.y);
-			return mat;
-		}
-		
-		/**
-		 * Performs a rotation around a specific point on an input matrix.
-		 * The result is a transformation matrix including the rotation.
-		 * @param mat an input transformation matrix
-		 * @param angle the rotation angle, in degrees
-		 * @param p the point about which to zoom in or out
-		 * @return the resulting, rotated transformation matrix
-		 */
-		public static function rotateMatrixBy(mat:Matrix, angle:Number, p:Point):Matrix
-		{
-			mat.translate(-p.x, -p.y);
-			mat.rotate(angle * Math.PI/180);
-			mat.translate(p.x, p.y);
-			return mat;
-		}
-		
-		/**
-		 * Pan the "camera" by the specified amount.
-		 * @param obj the display object to treat as the camera
-		 * @param dx the change in x position, in the parent's coordinate space
-		 * @param dy the change in y position, in the parent's coordinate space
-		 * @param t an optional transitioner for animating the pan
-		 */
-		public static function panBy(obj:DisplayObject, dx:Number, dy:Number,
-			t:Transitioner=null):void
-		{
-			var mat:Matrix = panMatrixBy(obj.transform.matrix, dx, dy);
-			if (t==null) obj.transform.matrix = mat;
-			else t.$(obj)["transform.matrix"] = mat;
-		}
-		
-		/**
-		 * Zoom the "camera" by the specified scale factor.
-		 * @param obj the display object to treat as the camera
-		 * @param scale a scale factor specifying the amount to zoom. A value
-		 *  of 2 will zoom in such that objects are twice as large. A value of
-		 *  0.5 will zoom out such that objects are half the size.
-		 * @param xp the x-coordinate around which to zoom, in stage
-		 *  coordinates. If this value is <code>NaN</code>, 0 will be used.
-		 * @param yp the y-coordinate around which to zoom, in stage
-		 *  coordinates. If this value is <code>NaN</code>, 0 will be used.
-		 * @param t an optional transitioner for animating the zoom
-		 */		
-		public static function zoomBy(obj:DisplayObject, scale:Number,
-			xp:Number=NaN, yp:Number=NaN, t:Transitioner=null):void
-		{
-			var p:Point = getLocalPoint(obj, xp, yp);
-			var mat:Matrix = zoomMatrixBy(obj.transform.matrix, scale, p);
-			if (t==null) obj.transform.matrix = mat;
-			else t.$(obj)["transform.matrix"] = mat;
-		}
-
-		/**
-		 * Rotate the "camera" by the specified amount.
-		 * @param obj the display object to treat as the camera
-		 * @param angle the amount to rotate, in degrees
-		 * @param xp the x-coordinate around which to rotate, in stage
-		 *  coordinates. If this value is <code>NaN</code>, 0 will be used.
-		 * @param yp the x-coordinate around which to rotate, in stage
-		 *  coordinates. If this value is <code>NaN</code>, 0 will be used.
-		 * @param t an optional transitioner for animating the rotation
-		 */
-		public static function rotateBy(obj:DisplayObject, angle:Number,
-			xp:Number=NaN, yp:Number=NaN, t:Transitioner=null):void
-		{
-			var p:Point = getLocalPoint(obj, xp, yp);
-			var mat:Matrix = rotateMatrixBy(obj.transform.matrix, angle, p);
-			if (t==null) obj.transform.matrix = mat;
-			else t.$(obj)["transform.matrix"] = mat;
-		}
-		
-		/**
-		 * Helper routine that maps points from stage coordinates to this
-		 * camera's parent's coordinate space. If either input value is NaN,
-		 * a value of zero is assumed.
-		 */
-		private static function getLocalPoint(obj:DisplayObject, xp:Number, yp:Number):Point
-		{
-			var xn:Boolean = isNaN(xp);
-			var yn:Boolean = isNaN(yp);
-			var p:Point = _point;
-			
-			if (!(xn && yn)) {
-				p.x = xp;
-				p.y = yp;
-				p = obj.parent.globalToLocal(p);
-			}
-			if (xn) p.x = 0;
-			if (yn) p.y = 0;
-			return p;
-		}
-		
-	} // end of class Transforms
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/util/heap/FibonacciHeap.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/util/heap/FibonacciHeap.as
deleted file mode 100644
index ff2cd4b290..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/util/heap/FibonacciHeap.as
+++ /dev/null
@@ -1,346 +0,0 @@
-package flare.vis.util.heap
-{
-	/**
-	 * A Fibonacci heap data structure for maintaining a sorted priority queue.
-	 * For more about this particular implementation see
-	 * <a target="_top" href="http://en.wikipedia.org/wiki/Fibonacci_heap">
-	 * Wikipedia's Fibonacci Heap article</a>.
-	 */
-	public class FibonacciHeap
-	{
-		private var _min:HeapNode;
-		private var _size:int;
-
-		/** True if the heap is empty, false otherwise. */
-		public function get empty():Boolean
-		{
-			return _min == null;
-		}
-		
-		/** The number of nodes contained in this heap. */
-		public function get size():int
-		{
-			return _size;
-		}
-		
-		/**
-		 * Clears the heap, removing all nodes.
-		 */
-		public function clear():void
-		{
-			_min = null;
-			_size = 0;
-		}
-
-		/**
-		 * Decrease the key value for a heap node, changing its key and
-		 * potentially re-configuring the heap structure
-		 * @param x the heap node
-		 * @param k the new key value for the node. If this value is greater
-		 *  than the node's current key value an error will be thrown.
-		 */		
-		public function decreaseKey(x:HeapNode, k:Number):void
-		{
-			if (k > x.key)
-            	throw new Error("Only lower key values allowed");
-
-        	x.key = k;
-        	var y:HeapNode = x.parent;
-
-	        if ((y != null) && (x.key < y.key)) {
-    	        cut(x, y);
-        	    cascadingCut(y);
-        	}
-
-        	if (x.key < _min.key) {
-            	_min = x;
-        	}
-		}
-
-		/**
-		 * Removes a node from the heap.
-		 * @param x the heap node to remove
-		 */
-		public function remove(x:HeapNode):void
-    	{
-        	decreaseKey(x, Number.NEGATIVE_INFINITY);
-        	removeMin();
-    	}
-
-		/**
-		 * Inserts a new node into the heap.
-		 * @param data the data to associate with the heap node
-		 * @param key the key value used to sort the heap node
-		 * @return the newly added heap node
-		 */		
-		public function insert(data:Object, key:Number):HeapNode
-		{
-			var n:HeapNode = new HeapNode(data, key);
-			n.inHeap = true;
-
-        	if (_min != null) {
-            	n.left = _min;
-            	n.right = _min.right;
-            	_min.right = n;
-            	n.right.left = n;
-
-            	if (key < _min.key)
-                	_min = n;
-        	} else {
-            	_min = n;
-        	}
-	        _size++;
-	        return n;
-		}
-
-		/**
-		 * Returns the heap node with the minimum key value.
-		 * @return the heap node with the minimum key value
-		 */
-		public function min():HeapNode
-		{
-			return _min;
-		}
-
-		/**
-		 * Removes and returns the heap node with the minimum key value.
-		 * @return the heap node with the minimum key value
-		 */
-		public function removeMin():HeapNode
-		{
-			var z:HeapNode = _min;
-			if (z == null) return z;
-			
-			var kids:int = z.degree;
-			var x:HeapNode = z.child;
-			var r:HeapNode;
-
-            // for each child of z do...
-            while (kids > 0) {
-                r = x.right;
-
-                // remove x from child list
-                x.left.right = x.right;
-                x.right.left = x.left;
-
-                // add x to root list of heap
-                x.left = _min;
-                x.right = _min.right;
-                _min.right = x;
-                x.right.left = x;
-
-                // set parent[x] to null
-                x.parent = null;
-                x = r;
-                kids--;
-            }
-
-            // remove z from root list of heap
-            z.left.right = z.right;
-            z.right.left = z.left;
-
-            if (z == z.right) {
-                _min = null;
-            } else {
-                _min = z.right;
-                consolidate();
-            }
-
-	        // decrement size of heap and return
-	        _size--;
-	  		z.inHeap = false;
-	        return z;
-		}
-
-		/**
-		 * Constructs the union of two fibonacci heaps.
-		 * @param h1 the first heap
-		 * @param h2 the second heap
-		 * @return the union of the two heaps
-		 */
-		public static function union(h1:FibonacciHeap, h2:FibonacciHeap):FibonacciHeap
-		{
-			var h:FibonacciHeap = new FibonacciHeap();
-					
-	        if (h1 != null && h2 != null) {
-	            h._min = h1._min;
-	
-	            if (h._min != null) {
-	                if (h2._min != null) {
-	                    h._min.right.left = h2._min.left;
-	                    h2._min.left.right = h._min.right;
-	                    h._min.right = h2._min;
-	                    h2._min.left = h._min;
-	                    if (h2._min.key < h1._min.key)
-	                        h._min = h2._min;
-	                }
-	            } else {
-	                h._min = h2._min;
-	            }
-	
-	            h._size = h1._size + h2._size;
-	        }
-	
-	        return h;
-		}
-
-	    private function cascadingCut(y:HeapNode):void
-	    {
-	        var z:HeapNode = y.parent;
-	        if (z != null) {
-	            if (!y.mark) {
-	                y.mark = true;
-	            } else {
-	                cut(y, z);
-	                cascadingCut(z);
-	            }
-	        }
-	    }
-
-	    private function consolidate():void
-	    {
-	    	var arraySize:int = _size + 1;
-	    	var array:Array = new Array(arraySize);
-	    	var i:uint;
-	
-	        // Initialize degree array
-	        for (i=0; i<arraySize; i++)
-	            array[i] = null;
-	
-	        // Find the number of root nodes.
-	        var numRoots:int = 0, d:int;
-	        var x:HeapNode = _min, y:HeapNode;
-	        var next:HeapNode, temp:HeapNode;
-	
-	        if (x != null) {
-	            numRoots++;
-	            x = x.right;
-	
-	            while (x != _min) {
-	                numRoots++;
-	                x = x.right;
-	            }
-	        }
-	
-	        // For each node in root list do...
-	        while (numRoots > 0) {
-	            // Access this node's degree..
-	            d = x.degree;
-	            next = x.right;
-	
-	            // ..and see if there's another of the same degree.
-	            while (array[d] != null) {
-	                // There is, make one of the nodes a child of the other.
-	                y = array[d];
-	
-	                // Do this based on the key value.
-	                if (x.key > y.key) {
-	                    temp = y;
-	                    y = x;
-	                    x = temp;
-	                }
-	
-	                // FiboHeapNode y disappears from root list.
-	                link(y, x);
-	
-	                // We've handled this degree, go to next one.
-	                array[d] = null;
-	                d++;
-	            }
-	
-	            // Save this node for later when we might encounter another
-	            // of the same degree.
-	            array[d] = x;
-	
-	            // Move forward through list.
-	            x = next;
-	            numRoots--;
-	        }
-	
-	        // Set min to null (effectively losing the root list) and
-	        // reconstruct the root list from the array entries in array[].
-	        _min = null;
-	
-	        for (i=0; i<arraySize; i++) {
-	            if (array[i] != null) {
-	                // We've got a live one, add it to root list.
-	                if (_min != null) {
-	                    // First remove node from root list.
-	                    array[i].left.right = array[i].right;
-	                    array[i].right.left = array[i].left;
-	
-	                    // Now add to root list, again.
-	                    array[i].left = _min;
-	                    array[i].right = _min.right;
-	                    _min.right = array[i];
-	                    array[i].right.left = array[i];
-	
-	                    // Check if this is a new min.
-	                    if (array[i].key < _min.key) {
-	                        _min = array[i];
-	                    }
-	                } else {
-	                    _min = array[i];
-	                }
-	            }
-	        }
-	    }
-
-	    private function cut(x:HeapNode, y:HeapNode):void
-	    {
-	        // remove x from childlist of y and decrement degree[y]
-	        x.left.right = x.right;
-	        x.right.left = x.left;
-	        y.degree--;
-	
-	        // reset y.child if necessary
-	        if (y.child == x) {
-	            y.child = x.right;
-	        }
-	
-	        if (y.degree == 0) {
-	            y.child = null;
-	        }
-	
-	        // add x to root list of heap
-	        x.left = _min;
-	        x.right = _min.right;
-	        _min.right = x;
-	        x.right.left = x;
-	
-	        // set parent[x] to nil
-	        x.parent = null;
-	
-	        // set mark[x] to false
-	        x.mark = false;
-	    }
-
-	    private function link(y:HeapNode, x:HeapNode):void
-	    {
-	        // remove y from root list of heap
-	        y.left.right = y.right;
-	        y.right.left = y.left;
-	
-	        // make y a child of x
-	        y.parent = x;
-	
-	        if (x.child == null) {
-	            x.child = y;
-	            y.right = y;
-	            y.left = y;
-	        } else {
-	            y.left = x.child;
-	            y.right = x.child.right;
-	            x.child.right = y;
-	            y.right.left = y;
-	        }
-	
-	        // increase degree[x]
-	        x.degree++;
-	
-	        // set mark[y] false
-	        y.mark = false;
-	    }
-		
-	} // end of class FibonacciHeap
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/util/heap/HeapNode.as b/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/util/heap/HeapNode.as
deleted file mode 100644
index 50a16c9298..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/flare/vis/util/heap/HeapNode.as
+++ /dev/null
@@ -1,42 +0,0 @@
-package flare.vis.util.heap
-{
-	/**
-	 * Represents a node in a heap data structure.
-	 * For use with the <code>FibonacciHeap</code> class.
-	 * @see flare.vis.util.FibonacciHeap
-	 */
-	public class HeapNode
-	{
-		/** Arbitrary client data property to store with the node. */
-		public var data:*;
-		/** The parent node of this node. */
-		public var parent:HeapNode;
-		/** A child node of this node. */
-		public var child:HeapNode;
-		/** The right child node of this node. */
-		public var right:HeapNode;
-		/** The left child node of this node. */
-		public var left:HeapNode;
-		/** Boolean flag useful for marking this node. */
-		public var mark:Boolean;
-		/** Flag indicating if this node is currently in a heap. */
-		public var inHeap:Boolean = true;
-		/** Key value used for sorting the heap nodes. */
-		public var key:Number;
-		/** The degree of this heap node (number of child nodes). */
-		public var degree:int;
-	
-		/**
-		 * Creates a new HeapNode
-		 * @param data arbitrary data to store with this node
-		 * @param key the key value to sort on
-		 */
-		function HeapNode(data:*, key:Number)
-		{
-			this.data = data;
-			this.key = key;
-			right = this;
-			left = this;
-		}
-	} // end of class HeapNode
-}
\ No newline at end of file
diff --git a/grade/report/visual/flare_visualization/flare/flare.vis/manifest.xml b/grade/report/visual/flare_visualization/flare/flare.vis/manifest.xml
deleted file mode 100644
index 91b76a8d3f..0000000000
--- a/grade/report/visual/flare_visualization/flare/flare.vis/manifest.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" ?>
-<componentPackage>
-  <component id="OperatorList" class="flare.vis.operator.OperatorList" />
-  <component id="OperatorSwitch" class="flare.vis.operator.OperatorSwitch" />
-
-  <component id="BifocalDistortion" class="flare.vis.operator.distortion.BifocalDistortion" />
-  <component id="FisheyeDistortion" class="flare.vis.operator.distortion.FisheyeDistortion" />
-  
-  <component id="ColorEncoder" class="flare.vis.operator.encoder.ColorEncoder" />
-  <component id="PropertyEncoder" class="flare.vis.operator.encoder.PropertyEncoder" />
-  <component id="ShapeEncoder" class="flare.vis.operator.encoder.ShapeEncoder" />
-  <component id="SizeEncoder" class="flare.vis.operator.encoder.SizeEncoder" />
-  
-  <component id="FisheyeTreeFilter" class="flare.vis.operator.filter.FisheyeTreeFilter" />
-  <component id="GraphDistanceFilter" class="flare.vis.operator.filter.GraphDistanceFilter" />
-  <component id="VisibilityFilter" class="flare.vis.operator.filter.VisibilityFilter" />
-  
-  <component id="AxisLayout" class="flare.vis.operator.layout.AxisLayout" />
-  <component id="CircleLayout" class="flare.vis.operator.layout.CircleLayout" />
-  <component id="DendrogramLayout" class="flare.vis.operator.layout.DendrogramLayout" />
-  <component id="ForceDirectedLayout" class="flare.vis.operator.layout.ForceDirectedLayout" />
-  <component id="IndentedTreeLayout" class="flare.vis.operator.layout.IndentedTreeLayout" />
-  <component id="NodeLinkTreeLayout" class="flare.vis.operator.layout.NodeLinkTreeLayout" />
-  <component id="PieLayout" class="flare.vis.operator.layout.PieLayout" />
-  <component id="RadialTreeLayout" class="flare.vis.operator.layout.RadialTreeLayout" />
-  <component id="RandomLayout" class="flare.vis.operator.layout.RandomLayout" />
-  <component id="StackedAreaLayout" class="flare.vis.operator.layout.StackedAreaLayout" />
-  <component id="TreeMapLayout" class="flare.vis.operator.layout.TreeMapLayout" />
-
-  <component id="ColorPalette" class="flare.vis.palette.ColorPalette" />
-  <component id="ShapePalette" class="flare.vis.palette.ShapePalette" />
-  <component id="SizePalette" class="flare.vis.palette.SizePalette" />
-
-  <component id="LinearScale" class="flare.vis.scale.LinearScale" />
-  <component id="LogScale" class="flare.vis.scale.LogScale" />
-  <component id="OrdinalScale" class="flare.vis.scale.OrdinalScale" />
-  <component id="QuantileScale" class="flare.vis.scale.QuantileScale" />
-  <component id="RootScale" class="flare.vis.scale.RootScale" />
-  <component id="TimeScale" class="flare.vis.scale.TimeScale" />
-
-  <component id="ControlList" class="flare.vis.controls.ControlList" />  
-  <component id="AnchorControl" class="flare.vis.controls.AnchorControl" />
-  <component id="DragControl" class="flare.vis.controls.DragControl" />
-  <component id="ExpandControl" class="flare.vis.controls.ExpandControl" />
-  <component id="HoverControl" class="flare.vis.controls.HoverControl" />
-  <component id="PanZoomControl" class="flare.vis.controls.PanZoomControl" />
-  <component id="SelectionControl" class="flare.vis.controls.SelectionControl" />
-</componentPackage>
diff --git a/grade/report/visual/flare_visualization/flare_visualization.as b/grade/report/visual/flare_visualization/flare_visualization.as
deleted file mode 100644
index bb7209bcd3..0000000000
--- a/grade/report/visual/flare_visualization/flare_visualization.as
+++ /dev/null
@@ -1,1413 +0,0 @@
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.org                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-  
- /**
- * This is the flex with flare based visualizer for the Moodle 2.x visual
- * grade book plug-in. This should load the grade book data for a given
- * visualization from the report/visual plug-in based on a set of flashvars
- * passed to it from Moodle and display a visual repersenation.
- */
-package {
-	//Flare imports
-    import flare.animate.Transitioner;
-    import flare.data.DataSet;
-    import flare.data.DataSource;
-    import flare.display.TextSprite;
-    import flare.vis.Visualization;
-    import flare.vis.controls.HoverControl;
-    import flare.vis.data.Data;
-    import flare.vis.data.DataSprite;
-    import flare.vis.data.EdgeSprite;
-    import flare.vis.data.NodeSprite;
-    import flare.vis.legend.Legend;
-    import flare.vis.legend.LegendItem;
-    import flare.vis.operator.encoder.ColorEncoder;
-    import flare.vis.operator.encoder.Encoder;
-    import flare.vis.operator.encoder.ShapeEncoder;
-    import flare.vis.operator.encoder.SizeEncoder;
-    import flare.vis.operator.layout.AxisLayout;
-    import flare.vis.operator.layout.CircleLayout;
-    import flare.vis.operator.layout.DendrogramLayout;
-    import flare.vis.operator.layout.ForceDirectedLayout;
-    import flare.vis.operator.layout.IndentedTreeLayout;
-    import flare.vis.operator.layout.Layout;
-    import flare.vis.operator.layout.NodeLinkTreeLayout;
-    import flare.vis.operator.layout.PieLayout;
-    import flare.vis.operator.layout.RadialTreeLayout;
-    import flare.vis.operator.layout.RandomLayout;
-    import flare.vis.operator.layout.StackedAreaLayout;
-    import flare.vis.operator.layout.TreeMapLayout;
-    import flare.vis.scale.Scale;
-    import flare.vis.util.Filters;
-    import flare.vis.util.graphics.Shapes;
-    
-    import flash.display.DisplayObject;
-    import flash.display.DisplayObjectContainer;
-    import flash.display.Sprite;
-    import flash.errors.IOError;
-    import flash.events.Event;
-    import flash.events.IOErrorEvent;
-    import flash.events.MouseEvent;
-    import flash.filters.GlowFilter;
-    import flash.geom.Rectangle;
-    import flash.net.URLLoader;
-    import flash.net.URLRequest;
-    import flash.text.TextField;
-    import flash.text.TextFormat;
-    import flash.utils.Dictionary;
-
-    [SWF(width="800", height="600", backgroundColor="#ffffff", frameRate="30")]
-    /**
-    * Main class for handling grade book data and greatating a visualization.
-    */
-    public class flare_visualization extends Sprite
-    {   
-    	/**
-    	 * The visualization object to be used in creating the visualization.
-    	 */
-    	private var vis:Visualization;
-    	
-    	/**
-    	 * A refernce to the currently displayed dialog box. If null no dialog
-    	 * box is currently being displayed.
-    	 */
-    	private var lastBox:Sprite = null;
-    	
-    	/**
-    	 * A refernce to the data sprite witch contains the data for witch the 
-    	 * currently displayed dialog box is based on and a child of.
-    	 */
-    	private var lastBoxData:DataSprite = null;
-    	
-    	/**
-    	 * A container for the legends witch will be displayed on the righ hand
-    	 * side.
-    	 */
-    	private var legends:Sprite;
-    	
-    	private var sideBar:Sprite;
-    	
-    	private var layout:Layout;
-    	
-    	private var encoders:Array;
-    	
-    	private var selectors:Sprite;
-    	
-    	private var controls:Sprite;
-    	
-    	/**
-    	 * The hover control for the dialog box.
-    	 */
-    	private var boxhc:HoverControl = new HoverControl();
-    	
-    	private var settings:XML = new XML();
-    	
-    	private var dataURL:String;
-    	
-    	private var settingsURL:String;
-    	
-    	private var loadingMessage:TextSprite;
-    	
-    	private var legendNodes:Dictionary;
-    	private var legendEdges:Dictionary;
-    	
-    	private var invertTransitioner:Transitioner;
-    	private var legendItemTransitioner:Transitioner;
-    	
-    	private var printVersion:Boolean;
-    	
-    	private var nodeSize:int = 1;
-    	
-    	private var errors:Sprite = new Sprite();
-    	
-    	private var debug:Boolean = false;
-    	
-    	private var debug_sessionid:String = "ad896bf3c1af448c05f292e7b14433e1";
-        private var debug_sessiontest:String = "nepQJfZ9pN";
-        private var debug_sessioncookie:String = "";
-        private var debug_visid:String = "grades_vs_items";
-    	private var debug_wwwroot:String = "http://localhost/moodle";
-    	private var debug_courseid:String = "3";
-    	
-    	
-    	/**
-    	 * The constucter for the flare_visualization class.
-    	 * Calls on harvest_data and sets up the varibles from the flashvars.
-    	 */	
-        public function flare_visualization()
-        {
-        	loadingMessage = new TextSprite("Loading....", new TextFormat("monospace", 20, 0x0000FF, true));
-        	addChild(loadingMessage);
-        	addChild(errors);
-        	
-        	// Call harvest_data, loading needed visualization data from moodle.
-        	// The Moodle wwwroot, course id, users sessionid, users session cookie 
-        	// and session test data are needed to get the data from moodle are 
-        	// loaded threw flashvars.
-        	loaderInfo.addEventListener(Event.COMPLETE, function(evt:Event):void {
-        		var wwwroot:String = loaderInfo.parameters['wwwroot'];
-        		var courseID:String = loaderInfo.parameters['courseid'];
-        		var sessioncookie:String = loaderInfo.parameters['sessioncookie'];
-        		var sessionid:String = loaderInfo.parameters['sessionid'];
-        		var sessiontest:String = loaderInfo.parameters['sessiontest'];
-        		var visid:String = loaderInfo.parameters['visid'];
-        		printVersion = booleanify(loaderInfo.parameters['printerversion']);
-        		
-        		if(debug) {
-        			trace("Debug mode on.");
-        			wwwroot = debug_wwwroot;
-        			courseID = debug_courseid; 
-        			sessioncookie = debug_sessioncookie;
-        			sessionid = debug_sessionid; 
-        			sessiontest = debug_sessiontest; 
-        			visid = debug_visid;
-        		}
-        			
-        		dataURL = wwwroot + '/grade/report/visual/data.php?id=' + escape(courseID) + '&sessioncookie=' +  escape(sessioncookie) + '&sessionid=' +  escape(sessionid) + '&sessiontest=' + escape(sessiontest) + '&visid=' + escape(visid);
-        		settingsURL = wwwroot + '/grade/report/visual/visual_settings.php?id=' + escape(courseID) + '&sessioncookie=' +  escape(sessioncookie) + '&sessionid=' +  escape(sessionid) + '&sessiontest=' + escape(sessiontest) + '&visid=' + escape(visid);
-        		
-        		harvest_data();
-        	});
-        }
-        
-        /**
-        * Harvests the data from Moodle and calls on buildVis to build the
-        * visualization once the data has been loaded.
-        * TODO: Add a loading bar and more feed back about the loading process.
-        * @param url The url from witch to load the tab formated data for the visualization.
-        */
-        public function harvest_data():void
-        {
-        		loadingMessage.text ="Loading Settings....";
-        		loadingMessage.x = loaderInfo.width/2 - loadingMessage.width/2;
-        		loadingMessage.y = loaderInfo.height/2 - loadingMessage.height/2;
-        		 
-        		
-        		try{
-        			var ds:DataSource = new DataSource(dataURL, "tab");
-        			var settingsRequest:URLRequest = new URLRequest(settingsURL);
-   					var settingsLoader:URLLoader = new URLLoader(settingsRequest);
-        	    
-        	  	  settingsLoader.addEventListener(IOErrorEvent.IO_ERROR, function(evt:IOErrorEvent):void {
-        	  	  	error("Loading", evt.text);	
-        	  	  });
-        	    
-        	  	  settingsLoader.addEventListener(Event.COMPLETE, function(evt:Event):void {
-        	  	  	try{
-        	  	  		settings = XML(settingsLoader.data);	
-        	  	  		loadingMessage.text = "Loading Data....";
-        	    		
-        	    		if(isnull(settings) || settings.length() < 1 || isnull(settings.layout)) {
-        	    			error("Loading", "Failed to load settings.");
-        	    			return;
-        	    		}
-        	    		
-        	   		 	var dataLoader:URLLoader = ds.load();
-        	    
-        	   	 		dataLoader.addEventListener(IOErrorEvent.IO_ERROR, function(evt:IOErrorEvent):void {
-        	    			error("Loading", evt.text);
-        	    		});
-        	    
-        	    		dataLoader.addEventListener(Event.COMPLETE, function(evt:Event):void {
-        	        		removeChild(loadingMessage);
-        	        		var data:DataSet = dataLoader.data as DataSet;
-        	        		buildVis(Data.fromDataSet(data));
-        	    		});
-        	  	  	} catch(e:Error) {
-        	  	  		error("", e.message);
-        	  	  	}
-        		  });
-        		} catch(e:IOError) {
-        			error("IO", e.message);
-        		} catch(e:Error) {
-        			error("", e.message) 				
-        		}
-		}
-        
-        public function updateVis(data:Data):void {
-        	var t:Transitioner = new Transitioner(2);
-        	makeEdges(data);
-        	vis.data = data;
-        	setUpEncoders();
-        	setDataProperties();
-        	setUpLegends();
-        	setUpLayout();
-        	//for(var i:int = 0; i < legends.numChildren; i++){ 
-        		//Legend(legends.getChildAt(i)).update(t);
-        	//}
-        	t.$(selectors).y = legends.height;
-        	t.$(controls).y = legends.height + selectors.height + 10;
-        	vis.update(t).play();
-        }
-        
-        public function reharvest_data(url:String):void {
-        	loadingMessage.text ="Loading Data....";
-        	addChild(loadingMessage);
-        	
-        	try{
-        		var ds:DataSource = new DataSource(url, "tab");
-        		var dataLoader:URLLoader = ds.load();
-        		
-        		dataLoader.addEventListener(IOErrorEvent.IO_ERROR, function(evt:IOErrorEvent):void {
-        	    	error("Loading", evt.text);
-        	    });
-        	    
-        	    dataLoader.addEventListener(Event.COMPLETE, function(evt:Event):void {
-        	    	removeChild(loadingMessage);
-        	    	var data:DataSet = dataLoader.data as DataSet;
-        	        updateVis(Data.fromDataSet(data));
-        	    });
-        	}catch(e:IOError) {
-        		error("IO", e.message);
-        	} catch(e:Error) {
-        		error("", e.message) 				
-        	}
-        }
-        
-        private function error(type:String = "", text:String = ""):void {
-        	trace(type + " Error: " + text);
-        	
-        	var textfield:TextField = new TextSprite(type + " Error: " + text, new TextFormat("monospace", 12, 0xFF0000, true)).textField;
-        	textfield.wordWrap = true;
-        	textfield.x = 0;
-        	textfield.y = errors.height;
-        	
-        	errors.addChild(textfield);	
-        }
-     
-     	/**
-     	 * Find the max width between a container and all of it's decendence
-     	 * This dose not find the width of a container but the greatest width
-     	 * of an invdual component in it's decenedences.
-     	 * @param d The display container to find the max width of.
-     	 * @return the max width value of the display objects.
-     	 */ 
-     	private function getMaxWidth(d:DisplayObjectContainer):int {
-     		var max:int = d.width;
-     		  
-            for(var k:uint = 0; k < d.numChildren; k++ ) {  
-            	var width:int = 0;
-            	
-                if(d.getChildAt(k) is DisplayObjectContainer) {
-                	width = getMaxWidth(DisplayObjectContainer(d.getChildAt(k)));  
-                } else {
-                	width = d.getChildAt(k).width;
-                }
-  				
-  				if(width > max) {
-  					max = width;
-  				}
-            }
-            
-            return max;
-        }
-     
-     	/**
-     	 * Simple function to retrun the greatest of two ints.
-     	 * @param num1 the first number to test
-     	 * @param num2 the second number to test
-     	 * @return the largest value between num1 and num2.
-     	 */
-     	private function max(num1:int, num2:int):int {
-     		if(num1 > num2) {
-     			return num1;
-     		} else {
-     			return num2;
-     		}
-     	}
-     
-     	/**
-     	 * Find the max height between a container and all of it's decendence
-     	 * This dose not find the width of a container but the greatest height
-     	 * of an invdual component in it's decenedences.
-     	 * @param d The display container to find the max height of.
-     	 * @return the max height value of the display objects.
-     	 */ 
-     	private function getMaxHeight(d:DisplayObjectContainer):int {
-     		var max:int = d.height;
-     		  
-            for(var k:uint = 0; k < d.numChildren; k++ ) {  
-            	var height:int = 0;
-            	
-                if(d.getChildAt(k) is DisplayObjectContainer) {
-                	height = getMaxHeight(DisplayObjectContainer(d.getChildAt(k)));  
-                } else {
-                	height = d.getChildAt(k).height;
-                }
-  				
-  				if(height > max) {
-  					max = height;
-  				}
-            }
-            
-            return max;
-        }  
-     
-     	private function nullify(o:*):* {
-     		if(isnull(o)) {
-     			return null;
-     		} else {
-     			return o;
-     		}
-     	}
-     	
-     	private function isnull(o:*):Boolean {
-     		if(o == null || o.length == 0 || String(o).length == 0) {
-     			return true;
-     		} else {
-     			return false;
-     		}
-     	}
-     	
-     	private function booleanify(o:*):* {
-     		var ob:Object = nullify(o);
-     		
-     		if(String(ob).toLocaleLowerCase() == "false") {
-     			return false;
-     		} else if (String(ob).toLocaleLowerCase() == "true") {
-     			return true;
-     		}
-     		
-     		return ob;	
-     	}
-     	
-     	private function passSettings(theClass:Class, XMLSettings:XMLList, ... args):* {
-     		var params:Array = new Array();
-     		var cleanParam:*;
-     		
-     		for each(var arg:* in args) {
-     			params.push(arg);
-     		}
-     		
-     		for each(var param:* in XMLSettings) {
-     			cleanParam = booleanify(param);
-     			if(cleanParam != null) {
-     				params.push(cleanParam);
-     			} 
-     		}
-     		
-     		switch(params.length) {
-     			case 1: return new theClass(params[0]);
-     			case 2: return new theClass(params[0], params[1]);
-     			case 3: return new theClass(params[0], params[1], params[2]);
-     			case 4: return new theClass(params[0], params[1], params[2], params[3]);
-     			case 5: return new theClass(params[0], params[1], params[2], params[3], params[4]);
-     			case 6: return new theClass(params[0], params[1], params[2], params[3], params[4], params[5]);
-     			case 7: return new theClass(params[0], params[1], params[2], params[3], params[4], params[5], params[6]);
-     			case 8: return new theClass(params[0], params[1], params[2], params[3], params[4], params[5], params[6], params[7]);
-     			case 9: return new theClass(params[0], params[1], params[2], params[3], params[4], params[5], params[6], params[7], params[8]);
-     			case 10: return new theClass(params[0], params[1], params[2], params[3], params[4], params[5], params[6], params[7], params[8], params[9]);
-     			default: return new theClass();
-     		}
-     	}
-     
-     	private function toStringArray(xmllist:XMLList):Object {
-     		if(xmllist.length() > 1) {
-     			var array:Array = new Array;
-     			
-     			for each(var element:XML in xmllist) {
-     				array.push(String(element));
-     			}
-     			
-     			return array;
-     		} else {
-     			return String(xmllist);
-     		}
-     	}
-     	
-     	private function toNumberArray(xmllist:XMLList):Object {
-     		if(xmllist.length() > 1) {
-     			var array:Array = new Array;
-     			
-     			for each(var element:XML in xmllist) {
-     				array.push(Number(element));
-     			}
-     			
-     			return array;
-     		} else {
-     			return Number(xmllist);
-     		}
-     	}
-     	
-     	private function makeEdges(data:Data):void {
-     		if(!isnull(settings.edge)) {
-            	for each(var edge:XML in settings.edge) {
-            		data.createEdges(toStringArray(edge.sortby), toStringArray(edge.groupby));
-            	}
-            }
-     	}
-     	
-     	private function setDataProperties():void {
-     		vis.data.nodes.visit(function(d:DataSprite):void {
-            	if(!isnull(settings.style.nodeshape)) {
-            		d.shape = settings.style.nodeshape;
-            	}
-				
-				if(d.shape == Shapes.HORIZONTAL_BAR || d.shape == Shapes.VERTICAL_BAR) {
-					nodeSize = 2;	
-				}
-				
-				d.size = nodeSize;
-				d.fillColor = 0x018888ff;
-				d.fillAlpha = 0.2;
-				d.addEventListener(MouseEvent.CLICK, mouseClicked);
-				d.lineWidth = 2;
-			});
-			
-			vis.data.edges.visit(function(d:DataSprite):void {
-				if(!isnull(settings.style.edgeshape)) {
-					d.shape = settings.style.edgeshape;
-				}
-				d.lineWidth = 2;
-				d.fillAlpha = 1;
-			});
-     	}
-     	
-     	private function setUpLayout():void {
-     		vis.operators.remove(layout);
-     		layout = null;
-     		
-     		if(isnull(settings.layout.type)) {
-     			error("Bad Settings", "Missing layout type value.");
-				return;
-     		}
-     		
-     		// Set up the layout
-			switch(int(settings.layout.type)) {
-				case 1: 
-						if(!isnull(settings.layout.xaxis.field) && !isnull(settings.layout.yaxis.field)) {
-							layout = passSettings(AxisLayout, settings.layout.setting, settings.layout.xaxis.field, settings.layout.yaxis.field);
-						} else {
-							error("Bad Settings", "Missing x or y axis feild for AxisLayout");
-							return;
-						}  
-						break;
-				case 2:	layout = passSettings(CircleLayout, settings.layout.setting);
-						break;
-				case 3: layout = passSettings(DendrogramLayout, settings.layout.setting);
-						break;
-				case 4: layout = passSettings(ForceDirectedLayout, settings.layout.setting);
-						break;
-				case 5: layout = passSettings(IndentedTreeLayout, settings.layout.setting);
-						break;
-				case 6: layout = passSettings(NodeLinkTreeLayout, settings.layout.setting);
-						break;
-				case 7: layout = passSettings(PieLayout, settings.layout.setting);
-						break;
-				case 8: layout = passSettings(RadialTreeLayout, settings.layout.setting);
-						break;
-				case 9: layout = new RandomLayout();
-						break;
-				case 10: layout = passSettings(StackedAreaLayout, settings.layout.setting);
-						 break;
-				case 11: layout = new TreeMapLayout();
-						 break;
-				default:
-						if(!isnull(settings.layout.xaxis.field) && !isnull(settings.layout.yaxis.field)) {
-							layout = passSettings(AxisLayout, settings.layout.setting, settings.layout.xaxis.field, settings.layout.yaxis.field);
-						} else {
-							error("Bad Settings", "Missing x or y axis feild for AxisLayout");
-							return;
-						}
-						break;
-			}
-			
-			vis.operators.add(layout);
-     	}
-     	
-     	private function setUpEncoders():void {
-     		var e:Encoder;
-     		
-     		for each(var enc:Encoder in encoders) {
-     			vis.operators.remove(enc);
-     		}
-     		
-     		// Set up the encoders
-			encoders = new Array();
-			
-			for each(var encoder:XML in settings.encoder) {
-				switch(int(encoder.type)) {
-					case 1: e = passSettings(ColorEncoder, encoder.setting, encoder.datafield);
-							break;
-					case 2: e = passSettings(ShapeEncoder, encoder.setting, encoder.datafield);
-							break;
-					case 3: e = passSettings(SizeEncoder, encoder.setting, encoder.datafield);
-							break;
-					default: e = passSettings(ColorEncoder, encoder.setting, encoder.datafield);
-							break;
-				}
-				
-				encoders[encoder.id] = e;
-				vis.operators.add(e);
-			}
-     	}
-     	
-     	private function setUpLegends():void {
-     		var dataName:String;
-     		
-     		for(var i:int = 0; i < legends.numChildren; i++){ 
-        		for(var k:int = 0; k < Legend(legends.getChildAt(i)).items.numChildren; k++) {
-        			Legend(legends.getChildAt(i)).items.removeChildAt(k);	
-        		}
-        		legends.removeChildAt(i);
-        	}
-     		
-     		legendNodes = new Dictionary();
-     		legendEdges = new Dictionary();
-     		
-			if(!isnull(settings.legend)) {
-				var nextLegendY:int = 0;
-				for each(var legend:XML in settings.legend) {
-					var en:Encoder = encoders[legend.encoderid];
-					var l:Legend;
-					
-					switch(int(settings.encoder.(id == int(legend.encoderid)).type)) {
-						case 1: l = new Legend(en.source, en.scale, ColorEncoder(en).colors);
-								break;
-						case 2: l = new Legend(en.source, en.scale, null, ShapeEncoder(en).shapes);
-								break;
-						case 3: l = new Legend(en.source, en.scale, null, null, SizeEncoder(en).sizes);
-								break;
-						default: l = new Legend(en.source, en.scale, ColorEncoder(en).colors);
-								break;
-					} 
-				
-					l.x = 0;
-					l.y = nextLegendY;
-					nextLegendY += l.height;
-					
-					//l.items.addEventListener(MouseEvent.CLICK, legendClick);
-				
-					var lhc:HoverControl = new HoverControl(l.items);
-            		lhc.onRollOver = legendRollOver;
-					lhc.onRollOut = legendRollOut;
-					
-					legends.addChild(l);
-					
-					dataName = l.dataField.substr(l.dataField.lastIndexOf('.') + 1);
-					for(var j:int = 0; j < l.items.numChildren; j++) {
-						LegendItem(l.items.getChildAt(j)).addEventListener(MouseEvent.CLICK, legendClick);
-						//LegendItem(l.items.getChildAt(j)).label.textMode = TextSprite.DEVICE;
-						//LegendItem(l.items.getChildAt(j)).label.textField.y -= 8;
-						
-						legendNodes[LegendItem(l.items.getChildAt(j))] = new Array();
-						legendEdges[LegendItem(l.items.getChildAt(j))] = new Array();
-
-						vis.data.nodes.visit(function(n:NodeSprite):void {
-							if(n.data.hasOwnProperty(dataName) && LegendItem(l.items.getChildAt(j)).value == n.data[dataName]) {
-								(legendNodes[LegendItem(l.items.getChildAt(j))] as Array).push(n);
-							}				
-						});
-						
-						vis.data.edges.visit(function(e:EdgeSprite):void {
-							if(e.data.hasOwnProperty(dataName) && LegendItem(l.items.getChildAt(j)).value == e.data[dataName]) {
-								(legendEdges[LegendItem(l.items.getChildAt(j))] as Array).push(e);
-							}				
-						});
-						
-						if(XMLList(legend.show).length() > 0 && !XMLList(legend.show).contains(LegendItem(l.items.getChildAt(j)).value)) {
-							LegendItem(l.items.getChildAt(j)).alpha = 0.4;
-						}
-					}
-				}
-				
-				removeLegenedItemsNodes();
-			}
-     	}
-     	
-     	/**
-     	 * Builds the visualization based on the loaded data.
-     	 * Also sets up the legends, buttons and controls.
-     	 * @param data The data that was loaded in from moodle.
-     	 */
-     	private function buildVis(data:Data):void
-        {
-            makeEdges(data);
-         
-            vis = new Visualization(data);
-            legends = new Sprite();
-            sideBar = new Sprite();
-            
-            // Set the functions to be called when a dialog box is hovered over.
-            boxhc.onRollOver = boxRollOver;
-			boxhc.onRollOut = boxRollOut;
-            
-			// Set up the properitys of the data sprites and add a eventlistener to check for
-            // clicks on them.
-			setDataProperties();
-			
-			setUpEncoders();
-			
-			// Set up the legends.
-			setUpLegends();
-			
-			setUpLayout();
-			
-			if(!isnull(settings.layout.yaxis.labelformat)) {
-				vis.xyAxes.yAxis.labelFormat = settings.layout.yaxis.labelformat;
-			} else {
-				vis.xyAxes.yAxis.labelFormat = "0";
-			}
-			
-			if(!isnull(settings.layout.xaxis.labelformat)) {
-				vis.xyAxes.xAxis.labelFormat = settings.layout.xaxis.labelformat;
-			} else {
-				vis.xyAxes.xAxis.labelFormat = "0";
-			}
-			
-			if(!isnull(settings.layout.xaxis.min)) {
-				vis.xyAxes.xAxis.axisScale.min = settings.layout.xaxis.min;
-				vis.xyAxes.xAxis.axisScale.flush = true;
-			}
-			
-			if(!isnull(settings.layout.xaxis.max)) {
-				vis.xyAxes.xAxis.axisScale.max = settings.layout.xaxis.max;
-				vis.xyAxes.xAxis.axisScale.flush = true;
-			}
-			
-			if(!isnull(settings.layout.yaxis.min)) {
-				vis.xyAxes.yAxis.axisScale.min = settings.layout.yaxis.min;
-			}
-			
-			if(!isnull(settings.layout.yaxis.max)) {
-				vis.xyAxes.yAxis.axisScale.max = settings.layout.yaxis.max;
-			}
-			
-			if(!isnull(settings.layout.yaxis.yoffset)) {
-				vis.xyAxes.yAxis.labelOffsetY = settings.layout.yaxis.yoffset;
-			}
-			
-			if(!isnull(settings.layout.yaxis.xoffset)) {
-				vis.xyAxes.yAxis.labelOffsetX = settings.layout.yaxis.xoffset;
-			}
-			
-			if(!isnull(settings.layout.xaxis.yoffset)) {
-				vis.xyAxes.xAxis.labelOffsetY = settings.layout.xaxis.yoffset;
-			}
-			
-			if(!isnull(settings.layout.xaxis.xoffset)) {
-				vis.xyAxes.xAxis.labelOffsetX = settings.layout.xaxis.xoffset;
-			}
-			
-			// Set up the layout of the axes.
-            vis.xyAxes.xAxis.horizontalAnchor = TextSprite.LEFT; 
-			vis.xyAxes.xAxis.verticalAnchor = TextSprite.MIDDLE; 
-			vis.xyAxes.xAxis.labelAngle = Math.PI / 2;
-			vis.xyAxes.xAxis.fixLabelOverlap = false;
-			vis.xyAxes.yAxis.fixLabelOverlap = false;
-			//vis.xyAxes.yAxis.labelTextMode = TextSprite.DEVICE;
-		
-		
-			// Update the visualization so the widths and other values are correct.
-            vis.update();
-			
-			// Initalize the X and Y axis labels and the visualizations title.
-			var labelX:TextSprite = new TextSprite(settings.labels.xaxis, new TextFormat(settings.style.text.font, settings.style.text.size)); 
-			var labelY:TextSprite = new TextSprite(settings.labels.yaxis, new TextFormat(settings.style.text.font, settings.style.text.size));
-			var title:TextSprite = new TextSprite(settings.labels.title, new TextFormat(settings.style.text.font, int(settings.style.text.size) + 5));
-			
-			// Find the largest width out of the X axis labels so it can used for positing sprites.
-           	var xLabelsHeight:int = getMaxHeight(vis.xyAxes.xAxis.labels);
-            var yLabelsWidth:int = getMaxWidth(vis.xyAxes.yAxis.labels);
-            
-			// Position the visualization.
-			vis.y = title.height + 10;
-            vis.x = labelY.height + -vis.xyAxes.yAxis.labelOffsetX + yLabelsWidth;
-			
-			
-			
-			legendItemTransitioner = new Transitioner(0.5);
-			sideBar.addChild(legends);
-			
-			selectors = new Sprite();
-			if(!isnull(settings.selector)) {
-				for each(var selector:XML in settings.selector) {
-					var selectorSprite:Selector = new Selector(selector.param, selector.option, selectorClick, selector.active, legends.width);
-					selectorSprite.x = 0;
-					selectorSprite.y = selectors.height;
-					selectors.addChild(selectorSprite);
-				}
-			}
-			sideBar.addChild(selectors);
-			
-			//vis.update();
-
-            // Set the bounds of the visualization based on the hieght and width of the flash application,
-            // and the other components so the visualization is takes up the unused space.
-            vis.bounds = new Rectangle(0, 0, loaderInfo.width - (sideBar.width + 15 + vis.x), loaderInfo.height - (vis.y + xLabelsHeight + labelX.height + vis.xyAxes.xAxis.labelOffsetY)); 
-            
-            // Add the visualization to the main sprite.
-            addChild(vis);
-            
-            // Position the legends.
-            //legends.x = vis.bounds.width + 10;
-            legends.x = 0;
-            legends.y = 0;
-            
-            sideBar.x = vis.bounds.width + 10;
-            sideBar.y = 0;
-            
-            // Position and add the labels and title to the axes.
-			labelX.x = vis.bounds.width/2 - labelX.width/2;
-			labelX.y = vis.bounds.height + vis.xyAxes.xAxis.labelOffsetY + xLabelsHeight;
-            vis.xyAxes.xAxis.addChild(labelX);
-            
-			labelY.rotation = -90;
-			labelY.x = -vis.x;
-			labelY.y = (vis.bounds.height/2) + (labelY.height/2);
-			vis.xyAxes.yAxis.addChild(labelY);
-			
-			title.x = vis.bounds.width/2 - title.width/2;
-			title.y = -vis.y;
-			vis.xyAxes.addChild(title);
-            
-      		// Add the legeneds container to the visualization.
-            //vis.addChild(legends);
-            vis.addChild(sideBar);
-            
-            selectors.x = 0;
-			selectors.y = legends.y + legends.height;
-			//vis.addChild(selectors);
-            
-            // Set up the hovercontrol for the marks on the chart
-            var hc:HoverControl = new HoverControl(vis, Filters.isDataSprite);
-            hc.onRollOver = rollOver;
-			hc.onRollOut = rollOut;
-			
-			// Set up the buttons and a container for them.
-			controls = new Sprite();
-			var bInvert:Button = new Button(settings.lang.invertaxes, settings.style.button);
-			var bHideAxis:Button = new Button(settings.lang.hide + " " + settings.lang.axes, settings.style.button);
-			var bHideXLabel:Button = new Button(settings.lang.hide + " " + settings.lang.xlabels, settings.style.button);
-			var bHideYLabel:Button = new Button(settings.lang.hide + " " + settings.lang.ylabels, settings.style.button);
-			
-			var hideXLabelTransitioner:Transitioner = new Transitioner(2);
-			//hideXLabelTransitioner.onEnd = updateMarkVisiblity;
-			//hideXLabelTransitioner.onStart = updateMarkVisiblity;
-			
-			bHideXLabel.addEventListener(MouseEvent.CLICK, function(evt:MouseEvent):void {
-				if(!hideXLabelTransitioner.running) {
-					hideXLabelTransitioner.reset();
-					
-					if(bHideXLabel.text == settings.lang.show + " " +  settings.lang.xlabels) {
-						bHideXLabel.text = settings.lang.hide + " " + settings.lang.xlabels;
-						vis.xyAxes.xAxis.showLabels = true;
-						vis.bounds = new Rectangle(0, 0, loaderInfo.width - (sideBar.width + 15 + vis.x), loaderInfo.height - (vis.y + xLabelsHeight + labelX.height + vis.xyAxes.xAxis.labelOffsetY));
-					} else {
-						bHideXLabel.text = settings.lang.show + " " +  settings.lang.xlabels;
-						vis.xyAxes.xAxis.showLabels = false;
-						vis.bounds = new Rectangle(0, 0, loaderInfo.width - (sideBar.width + 15 + vis.x), loaderInfo.height - (vis.y + labelX.height));
-					}
-					
-					hideXLabelTransitioner.$(labelY).x = -vis.x;
-					hideXLabelTransitioner.$(labelY).y = vis.bounds.height/2 + labelY.height/2;
-				
-					vis.update(hideXLabelTransitioner).play();
-				}
-			});
-			
-			var hideYLabelTransitioner:Transitioner = new Transitioner(2);
-			//hideYLabelTransitioner.onEnd = updateMarkVisiblity;
-			//hideYLabelTransitioner.onStart = updateMarkVisiblity;
-			
-			bHideYLabel.addEventListener(MouseEvent.CLICK, function(evt:MouseEvent):void {
-				if(!hideYLabelTransitioner.running) {
-					var t:Transitioner = new Transitioner(2);
-					var newX:int;
-					
-					hideYLabelTransitioner.reset();
-					
-					if(bHideYLabel.text == settings.lang.show + " " +  settings.lang.ylabels) {
-						bHideYLabel.text = settings.lang.hide + " " +  settings.lang.ylabels;
-						vis.xyAxes.yAxis.showLabels = true;
-						newX = labelY.width + -vis.xyAxes.yAxis.labelOffsetX + yLabelsWidth;
-					} else {
-						bHideYLabel.text = settings.lang.show + " " +  settings.lang.ylabels;
-						vis.xyAxes.yAxis.showLabels = false;
-						newX = labelY.width;
-					}
-				
-					t.$(vis).x = newX;
-					vis.bounds = new Rectangle(0, 0, loaderInfo.width - (sideBar.width + 15 + newX), loaderInfo.height - (vis.y + xLabelsHeight + labelX.height + vis.xyAxes.xAxis.labelOffsetY));
-					
-					// Reposition the labels and title. 
-					t.$(title).x = vis.bounds.width/2 - title.width/2;
-					t.$(labelX).x = vis.bounds.width/2 - labelX.width/2;
-					t.$(labelX).y = vis.bounds.height + vis.xyAxes.xAxis.labelOffsetY + xLabelsHeight;
-					t.$(labelY).x = -newX;
-					t.$(labelY).y = vis.bounds.height/2 + labelY.height/2;
-				
-					// Keep the legends in there place.
-					t.$(sideBar).x = vis.bounds.width + 10;
-					
-					t.play();
-					vis.update(hideYLabelTransitioner).play();
-				}
-			});
-			
-			// Set up the transitioner to be used when inverting the axes
-			invertTransitioner = new Transitioner(2);
-			invertTransitioner.onEnd = function():void {
-				//updateMarkVisiblity();
-				vis.xyAxes.xAxis.labels.visible = true;
-				vis.xyAxes.yAxis.labels.visible = true;
-   			};
-            invertTransitioner.onStart = function():void {
-            	//updateMarkVisiblity();
-            	vis.xyAxes.xAxis.labels.visible = false;
-				vis.xyAxes.yAxis.labels.visible = false;
-            }
-			
-			// The function to invert the axes.
-			bInvert.addEventListener(MouseEvent.CLICK, function(evt:MouseEvent):void {
-				// If we are not allready in the process of inverting the axes.
-				if(!invertTransitioner.running && !legendItemTransitioner.running) {
-					var t:Transitioner = new Transitioner(2);
-					var tempText:String = labelX.text;
-					var tempOffset:int = vis.xyAxes.xAxis.labelOffsetX;
-					var tempWidth:uint = vis.bounds.width;
-					var tempLabelFormat:String = vis.xyAxes.xAxis.labelFormat;
-					var tempLabels:int = xLabelsHeight;
-					var tempScale:Scale = vis.xyAxes.xAxis.axisScale;
-					var tempLabelOffsetY:Number = vis.xyAxes.xAxis.labelOffsetY;
-					var tempLabelOffsetX:Number = vis.xyAxes.xAxis.labelOffsetX;
-					var currentXLabelsHeight:int = getMaxWidth(vis.xyAxes.yAxis.labels);
-					
-					var tempShowLabels:Boolean = vis.xyAxes.xAxis.showLabels;
-				
-					// Rest the transitioner for a clean transition.
-					invertTransitioner.reset();
-					
-					vis.xyAxes.xAxis.axisScale = vis.xyAxes.yAxis.axisScale;
-					vis.xyAxes.yAxis.axisScale = tempScale;
-					vis.xyAxes.yAxis.axisScale.flush = true;
-					vis.xyAxes.xAxis.axisScale.flush = true
-					
-					// Flip the axis feilds.
-					if(settings.layout.type == 1) {
-						AxisLayout(layout).xField = settings.layout.yaxis.field;
-						AxisLayout(layout).yField = settings.layout.xaxis.field;
-						settings.layout.xaxis.field = AxisLayout(layout).xField;
-						settings.layout.yaxis.field = AxisLayout(layout).yField;
-					
-						var tempStack:Boolean = AxisLayout(layout).xStacked;
-						AxisLayout(layout).xStacked = AxisLayout(layout).yStacked;
-						AxisLayout(layout).yStacked = tempStack;
-						
-						if(XMLList(settings.layout.setting).length() >= 2 && !isnull(settings.layout.setting[0]) && !isnull(settings.layout.setting[0])) {
-							var tempStackSetting:String = settings.layout.setting[0].toString();
-							settings.layout.setting[0] = settings.layout.setting[1].toString();
-							settings.layout.setting[1] = tempStackSetting;
-						} else if(XMLList(settings.layout.setting).length() == 1 && !isnull(settings.layout.setting[0])) {
-							settings.layout.setting[1] = settings.layout.setting[0].toString();
-							settings.layout.setting[0] = "false";
-							
-						}
-					}
-					
-					vis.xyAxes.xAxis.labelFormat = vis.xyAxes.yAxis.labelFormat;
-					vis.xyAxes.yAxis.labelFormat = tempLabelFormat;
-					
-					
-					vis.xyAxes.xAxis.labelOffsetX = vis.xyAxes.yAxis.labelOffsetY * -1;
-					vis.xyAxes.yAxis.labelOffsetY = tempLabelOffsetX * -1;
-					vis.xyAxes.xAxis.labelOffsetY = vis.xyAxes.yAxis.labelOffsetX * -1;
-					vis.xyAxes.yAxis.labelOffsetX = tempLabelOffsetY * -1;
-					
-					xLabelsHeight = yLabelsWidth;
-					yLabelsWidth = tempLabels;
-				
-				
-					vis.xyAxes.xAxis.showLabels = vis.xyAxes.yAxis.showLabels;
-					vis.xyAxes.yAxis.showLabels = tempShowLabels;
-				
-					if(vis.xyAxes.yAxis.showLabels) {
-						bHideYLabel.text = settings.lang.hide + " " +  settings.lang.ylabels;
-					} else {
-						bHideYLabel.text = settings.lang.show + " " +  settings.lang.ylabels;
-					}
-					
-					if(vis.xyAxes.xAxis.showLabels) {
-						bHideXLabel.text = settings.lang.hide + " " +  settings.lang.xlabels;
-					} else {
-						bHideXLabel.text = settings.lang.show + " " +  settings.lang.xlabels;
-					}
-					
-					// Flip the labels
-					labelX.text = labelY.text;
-					labelY.text = tempText;
-				
-					if(settings.style.nodeshape == Shapes.VERTICAL_BAR || settings.style.nodeshape == Shapes.HORIZONTAL_BAR) {
-						vis.data.nodes.visit(function(d:NodeSprite):void {
-							if(d.shape == Shapes.VERTICAL_BAR) {
-								t.$(d).shape = Shapes.HORIZONTAL_BAR;
-							} else {
-								t.$(d).shape = Shapes.VERTICAL_BAR;
-							}
-						});
-					
-						if(settings.style.nodeshape == Shapes.VERTICAL_BAR) {
-							settings.style.nodeshape = Shapes.HORIZONTAL_BAR;
-						} else {
-							settings.style.nodeshape = Shapes.VERTICAL_BAR;
-						}
-				
-					
-						for(var li:Object in legendNodes) {
-							for each(var node:NodeSprite in legendNodes[LegendItem(li)] as Array) {
-								if(node.shape == Shapes.VERTICAL_BAR) {
-									node.shape = Shapes.HORIZONTAL_BAR;
-								} else {
-									node.shape = Shapes.VERTICAL_BAR;
-								}
-							}
-						}
-					}
-				
-					// Find the new X value for the visualization.
-					var newX:int = labelY.width + vis.xyAxes.xAxis.labelOffsetY + getMaxHeight(vis.xyAxes.xAxis.labels);
-				
-					// Reposition and set the bounds of the visualization.
-					t.$(vis).x = newX;
-					vis.bounds = new Rectangle(0, 0, loaderInfo.width - (sideBar.width + 15 + newX), loaderInfo.height - (vis.y + currentXLabelsHeight + labelX.height + vis.xyAxes.xAxis.labelOffsetY));
-				
-					// Reposition the labels and title. 
-					t.$(title).x = vis.bounds.width/2 - title.width/2;
-					t.$(labelX).x = vis.bounds.width/2 - labelX.width/2;
-					t.$(labelX).y = vis.bounds.height + vis.xyAxes.xAxis.labelOffsetY + currentXLabelsHeight;
-					t.$(labelY).x = -newX;
-					t.$(labelY).y = vis.bounds.height/2 + labelY.height/2;
-				
-					// Keep the legends in there place.
-					t.$(sideBar).x = vis.bounds.width + 10;
-				
-					
-					//Play the transition.
-            		t.play();
-            		vis.update(invertTransitioner).play();
-    			}
-			});
-			
-			// Set up the transitioner for the hide axes button.
-			var hideAxisTrans:Transitioner = new Transitioner(1);
-			
-			// Function for hidding the axes.
-			bHideAxis.addEventListener(MouseEvent.CLICK, function(evt:MouseEvent):void {
-				// If we are not allready in the process of hidding the axes
-				if(!hideAxisTrans.running) {
-					// Reset the transitoner for a clean transiton.
-					hideAxisTrans.reset();
-					
-					// Hide or show the axes.
-					if(bHideAxis.text == settings.lang.show + " " + settings.lang.axes) {
-						hideAxisTrans.$(bHideAxis).text = settings.lang.hide + " " + settings.lang.axes;
-						layout.showAxes(hideAxisTrans).play();
-					} else {
-						hideAxisTrans.$(bHideAxis).text = settings.lang.show + " " + settings.lang.axes;
-						layout.hideAxes(hideAxisTrans).play();
-					}
-				}
-			});
-			
-			// Position the buttons inside there container.
-			bHideXLabel.x = 0;
-			bHideXLabel.y = 0;
-			
-			bHideAxis.x = sideBar.width - bHideAxis.width - 5;
-			bHideAxis.y = bHideXLabel.y;
-			
-			bInvert.x = sideBar.width - bInvert.width - 5;
-			bInvert.y = bHideXLabel.y + bHideXLabel.height + 2;
-			
-			bHideYLabel.x = 0;
-			bHideYLabel.y = bHideXLabel.y + bHideXLabel.height + 2;
-			
-			// Poistion the buttons container.
-			controls.x = 0; 
-			controls.y = sideBar.height + 10; 
-			
-			// Add the buttons to the container and the container to the main sprite.
-			controls.addChild(bInvert);
-			controls.addChild(bHideAxis);
-			controls.addChild(bHideXLabel);
-			controls.addChild(bHideYLabel);
-			
-			if(!printVersion){
-				sideBar.addChild(controls);
-			}
-			
-			// Set the marks on the chart to the higest deepth.
-            vis.setChildIndex(vis.marks, vis.numChildren - 1);
-	
-			// Update.
-			vis.update();
-			//updateMarkVisiblity();
-        }
-        
-        /**
-        * Roll over function witch makes the object 0.5 units bigger and adds a glow filter.
-        * @param ob the object witch was rolled over.
-        */
-        private function rollOver(ob:Object):void {
-        	ob.filters = [new GlowFilter(0xFFFF55, 0.8, 6, 6, 10)];
-        	ob.size = nodeSize + 0.5;
-        }
-        
-        /**
-        * Roll out function witch removes the filters and makes the object 0.5 units smaller.
-        * @param ob the object witch was rolled out of.
-        */
-        private function rollOut(ob:Object):void {
-        	ob.filters = null;
-        	ob.size = nodeSize;
-        }
-        
-        /**
-        * Roll over function for the dialog box.
-        * Adds a glow filter to the curently active dialog box.
-        * @param ob a child of the dialog box.
-        */
-        private function boxRollOver(ob:Object):void {
-        	if(lastBoxData != null) {
-        		lastBoxData.filters = [new GlowFilter(0xFFFF55, 0.8, 6, 6, 10)];
-        	}
-        }
-        
-        /**
-        * Roll out function for the dialog box.
-        * Removes filters on the curently active dialog box.
-        * @param ob a child of the dialog box.
-        */
-        private function boxRollOut(ob:Object):void {
-        	if(lastBoxData != null) {
-        		lastBoxData.filters = null;
-        	}
-        }
-        
-        /**
-        * Finds the Legend belonging to the LegendItem passed.
-        * TODO: See if this can be replaced by a .parent call.
-        * @param item a LegendItem to find the Legend of.
-        * @return the Legend that contains the passed LegendItem.
-        */
-        private function findLegendByItem(item:LegendItem):Legend {
-       		for(var i:uint = 0; i < legends.numChildren; i++ ) {
-        		if(Legend(legends.getChildAt(i)).items.contains(item)) {
-        			return Legend(legends.getChildAt(i));
-        		}
-        	}
-        	
-        	return null;
-        }
-        
-        /**
-        * Roll over function for legends.
-        * Adds a glow filter to the legend's item aswell as all the markers on the chart
-        * that are realted to the legend item and incrases there size by 1 unit.
-        * @param ob the LegendItem being rolled over.
-        */ 
-        private function legendRollOver(ob:Object):void {
-        	var item:LegendItem;
-        	
-        	if(ob is LegendItem) {
-        		item = LegendItem(ob);
-        	} else if(ob is TextField) {
-        		ob.filters = [new GlowFilter(0xFFFF55, 0.8, 6, 6, 10)];
-        		item = LegendItem(TextField(ob).parent.parent);
-        	} else {
-        		return;
-        	}
-        	
-        	var legend:Legend = Legend(item.parent.parent);
-        		
-        	if(legend) {
-        		var dataName:String = legend.dataField.substr(legend.dataField.lastIndexOf('.') + 1);
-        		
-        		item.filters = [new GlowFilter(0xFFFF55, 0.8, 6, 6, 10)];
-        		
-        		vis.data.visit(function(d:DataSprite):void {
-					if(d.data.hasOwnProperty(dataName) && item.value == d.data[dataName]) {
-						d.filters = [new GlowFilter(0xFFFF55, 0.8, 6, 6, 10)];
-						d.size = nodeSize + 1;
-					}
-				}, 3, Filters.isDataSprite);
-        	}
-        }
-        
-        /**
-        * Roll out function for legends.
-        * Removes filters to the legend's item aswell as all the markers on the chart
-        * that are realted to the legend item and decrases there size by 1 unit.
-        * @param ob the LegendItem being rolled out of.
-        */ 
-        private function legendRollOut(ob:Object):void {
-        	var item:LegendItem;
-        	
-        	if(ob is LegendItem) {
-        		item = LegendItem(ob);
-        	} else if(ob is TextField) {
-        		ob.filters = null;
-        		item = LegendItem(TextField(ob).parent.parent);
-        	} else {
-        		return;
-        	}
-        	
-        	var legend:Legend = Legend(item.parent.parent);
-        	
-        	if(legend) {
-        		var dataName:String = legend.dataField.substr(legend.dataField.lastIndexOf('.') + 1);
-        		
-        		item.filters = null;
-        		
-        		vis.data.visit(function(d:DataSprite):void {
-					if(d.data.hasOwnProperty(dataName) && item.value == d.data[dataName]) {
-						d.filters = null;
-						d.size = nodeSize;
-					}
-				}, 3, Filters.isDataSprite);
-        	}
-        }
-        
-        /**
-        * Creates and returns a dialog box containing information on the passed data sprite.
-        * @param data the DataSprite containing the information to display.
-        * @returns the Sprite containing the dialog box.
-        */
-        private function dataDialogBox(data:DataSprite):Sprite {
-        	var box:Sprite = new Sprite;
-        	
-        	var backGround:Sprite = new Sprite;	
-        	backGround.graphics.beginFill(parseInt(settings.style.popup.bgcolor, 16), settings.style.popup.alpha);
-        	backGround.graphics.lineStyle(settings.style.popup.line.size, parseInt(settings.style.popup.line.color, 16), settings.style.popup.line.alpha);
-        	 
-        	var text:Sprite = new Sprite;
-        	var x:int = 5;
-        	var y:int = 0;
-        	
-        	for(var property:Object in data.data) {
-        		var temp:TextSprite = new TextSprite(property.toString() + ": " + data.data[property], new TextFormat(settings.style.popup.text.font, settings.style.popup.text.size, null, true));
-        		temp.x = x;
-        		temp.y = y;
-        		text.addChild(temp);
-        		y += temp.height;
-        	}
-   
-        	backGround.graphics.drawRoundRect(0, 0, text.width + 10, text.height, 30, 30);     	
-        	
-        	box.addChild(backGround);
-        	box.addChild(text);
-        	
-        	return box;
-        }
-        
-        
-        private function removeLegenedItemsNodes():void {
-        	for(var i:int = 0; i < legends.numChildren; i++) {
-        		for(var k:int = 0; k < Legend(legends.getChildAt(i)).items.numChildren; k++) {
-        			var legendItem:LegendItem = LegendItem(Legend(legends.getChildAt(i)).items.getChildAt(k));
-        		
-        			if(legendItem.alpha < 1) {
-        				removeLegendNodes(legendItem);
-        			}
-        		}
-        	}
-        }
-        
-        /**
-        * Check if a mark on the chart is visible based on the related LegendItems states.
-        * @param d the DataSprite to check the visiblility of.
-        * @returns true if the mark is visible.
-        */
-        private function markIsVisible(d:DataSprite):Boolean {
-        	var items:Array = getLegendItems(d);
-        	
-        	for each(var item:LegendItem in items) {
-        		if(item.alpha != 1) {
-        			return false;
-        		}
-        	}
-        	
-        	return true;
-        }
-        
-        /**
-        * Gets all LegenedItems realted to a given DataSprite/mark.
-        * @params d the DataSprite on the chart.
-        * @returns Array of LegendItems that are realted to the given DataSprite.
-        */
-        private function getLegendItems(d:DataSprite):Array {
-        	var items:Array = new Array();
-        	var legend:Legend;
-        	var item:LegendItem;
-        	var dataField:String;
-        	
-        	for(var i:uint = 0; i < legends.numChildren; i++) {
-        		legend = Legend(legends.getChildAt(i));
-				dataField = legend.dataField.substr(legend.dataField.lastIndexOf('.') + 1);
-
-				if(d.data.hasOwnProperty(dataField)) {
-        			for(var k:uint = 0; k < legend.items.numChildren; k++) {
-        				item = LegendItem(legend.items.getChildAt(k));
-        				
-        				if(d.data[dataField] == item.value) {
-        					items.push(item);
-        					break;
-        				}
-        			}
-    			}
-        	}
-        	
-        	return items;
-        }
-        
-        private function removeLegendNodes(item:LegendItem):void {
-        	if(item != null) {
-        		var legend:Legend = Legend(item.parent.parent);
-        		var dataName:String = legend.dataField.substr(legend.dataField.lastIndexOf('.') + 1);
-        		var nodes:Array = legendNodes[item] as Array;
-        	
-        		for each(var node:NodeSprite in nodes) {
-        			vis.data.removeNode(node);
-        		}
-        	}
-        }
-        
-        private function removeLegendEdges(item:LegendItem):void {
-        	if(item != null) {
-        		var legend:Legend = Legend(item.parent.parent);
-        		var dataName:String = legend.dataField.substr(legend.dataField.lastIndexOf('.') + 1);
-        		var edges:Array = legendEdges[item] as Array;
-        	
-        		for each(var edge:EdgeSprite in edges) {
-        			vis.data.removeEdge(edge);
-        		}
-        	}
-        }
-        
-        private function addLegendNodes(item:LegendItem):void {
-        	if(item != null) {
-        		var nodes:Array = legendNodes[item] as Array;
-        		
-        		for each(var node:NodeSprite in nodes) {
-        			if(markIsVisible(node)) {
-        				vis.data.addNode(node);
-        			}
-        		}
-        	}
-        }
-        
-        /*private function dirtyEdges():void {
-        	vis.data.edges.visit(function(e:EdgeSprite):void{
-        		e.dirty();
-        	});
-        }*/
-        
-        private function addLegendEdges(item:LegendItem):void {
-        	if(item != null) {
-        		var edges:Array = legendEdges[item] as Array;
-        		
-        		for each(var edge:EdgeSprite in edges) {
-        			if(markIsVisible(edge)) {
-        				edge.source.addOutEdge(edge);
-        				edge.target.addInEdge(edge);
-        				vis.data.addEdge(edge);
-        			}
-        		}
-        	}	
-        }
-        
-        /**
-        * Function to be called when a LegendItem is clicked.
-        * Changes the legendItems alpah value and updates mark visiblity.
-        * @param evt the mouse event.
-        */
-        private function legendClick(evt:MouseEvent):void {
-        	var ob:Object = evt.target;
-        	var item:LegendItem;
-        	
-        	if(ob is LegendItem) {
-        		item = LegendItem(ob);
-        	} else if(ob is TextField) {
-        		item = LegendItem(TextField(ob).parent.parent);
-        	} else {
-        		return;
-        	}
-
-        	if(item != null && !invertTransitioner.running && !legendItemTransitioner.running) {
-        		legendItemTransitioner.reset();
-        		
-        		if(item.alpha >= 1) {
-        			item.alpha = 0.4;
-        			//removeLegendEdges(item);
-        			removeLegendNodes(item);
-        		} else {
-        			item.alpha = 1.0;
-        			addLegendNodes(item);
-        			addLegendEdges(item);
-        		}
-        		
-        		setUpLayout();
-        		vis.update(legendItemTransitioner).play();
-        	}
-        }
-        
-        /**
-        * Function called when a click happens on a mark on the chart.
-        * Creates and adds a dialog box for that mark/DataSprite when clicked or removes the dialog box if
-        * the mark allready has one.
-        * @param the mouse event.
-        */
-        private function mouseClicked(evt:MouseEvent):void {
-        	if(DisplayObject(evt.target).parent == vis.marks) {
-        		if(lastBox != null && lastBoxData != null) {
-        			lastBoxData.removeChild(lastBox);
-        			boxhc.detach();
-        		}
-        		
-        		if(evt.target != lastBoxData) {
-        			lastBox = dataDialogBox(DataSprite(evt.target));
-        			lastBoxData = DataSprite(evt.target);
-        			Sprite(evt.target).addChild(lastBox);
-    				vis.marks.setChildIndex(Sprite(evt.target), vis.marks.numChildren - 1);
-    				boxhc.attach(Sprite(evt.target));
-        		} else {
-        			lastBoxData = null;
-        			lastBox = null;
-        		}
-        	}
-        }
-        
-        private function selectorClick(evt:MouseEvent):void {
-        	var selectorOption:SelectorOption = SelectorOption(evt.target);
-        	
-        	if(!selectorOption.active) {
-        		reharvest_data(dataURL + "&" + escape(selectorOption.param) + "=" + escape(selectorOption.value));
-        		selectorOption.active = true;
-        		selectorOption.alpha = 1;
-        		Selector(selectorOption.parent).active.active = false;
-        		Selector(selectorOption.parent).active.alpha = 0.4;		
-        		Selector(selectorOption.parent).active = selectorOption;
-        	}
-        }
-    }
-}
\ No newline at end of file
diff --git a/grade/report/visual/flex.php b/grade/report/visual/flex.php
deleted file mode 100644
index 150b8fc09a..0000000000
--- a/grade/report/visual/flex.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.org                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-/**
-* HTML for the visual report.
-* Based on generated code from flex builder.
-*/
-?>
-
-<div style="vertical-align: top; text-align: center;">
-<script src="AC_OETags.js" language="javascript"></script>
-<script language="JavaScript" type="text/javascript">
-<!--
-// -----------------------------------------------------------------------------
-// Major version of Flash required
-var requiredMajorVersion = 9;
-// Minor version of Flash required
-var requiredMinorVersion = 0;
-// Minor version of Flash required
-var requiredRevision = 28;
-// -----------------------------------------------------------------------------
-
-
-// Version check for the Flash Player that has the ability to start Player Product Install (6.0r65)
-var hasProductInstall = DetectFlashVer(6, 0, 65);
-
-// Version check based upon the values defined in globals
-var hasRequestedVersion = DetectFlashVer(requiredMajorVersion, requiredMinorVersion, requiredRevision);
-
-if ( hasProductInstall && !hasRequestedVersion ) {
-	// DO NOT MODIFY THE FOLLOWING FOUR LINES
-	// Location visited after installation is complete if installation is required
-	var MMPlayerType = (isIE == true) ? "ActiveX" : "PlugIn";
-	var MMredirectURL = window.location;
-    document.title = document.title.slice(0, 47) + " - Flash Player Installation";
-    var MMdoctitle = document.title;
-
-	AC_FL_RunContent(
-        "flashVars", "<?php echo $flashvarshtml; ?>",
-		"framerate", "<?php echo $visual->framerate; ?>",
-		"src", "playerProductInstall",
-		"FlashVars", "MMredirectURL="+MMredirectURL+'&MMplayerType='+MMPlayerType+'&MMdoctitle='+MMdoctitle+"",
-		"width", "<?php echo $visual->width; ?>",
-		"height", "<?php echo $visual->height; ?>",
-		"align", "middle",
-		"id", "flare_visualization",
-		"quality", "<?php echo $visual->quality ?>",
-		"bgcolor", "#<?php echo $visual->backgroundcolor ?>",
-		"name", "flare_visualization",
-		"allowScriptAccess","sameDomain",
-		"type", "application/x-shockwave-flash",
-		"pluginspage", "http://www.adobe.com/go/getflashplayer"
-	);
-} else if (hasRequestedVersion) {
-	// if we've detected an acceptable version
-	// embed the Flash Content SWF when all tests are passed
-	AC_FL_RunContent(
-            "flashVars", "<?php echo $flashvarshtml; ?>",
-			"framerate", "<?php echo $visual->framerate; ?>",
-			"src", "flare_visualization",
-			"width", "<?php echo $visual->width; ?>",
-			"height", "<?php echo $visual->height; ?>",
-			"align", "middle",
-			"id", "flare_visualization",
-			"quality", "<?php echo $visual->quality ?>",
-			"bgcolor", "#<?php echo $visual->backgroundcolor ?>",
-			"name", "flare_visualization",
-			"allowScriptAccess","sameDomain",
-			"type", "application/x-shockwave-flash",
-			"pluginspage", "http://www.adobe.com/go/getflashplayer"
-	);
-  } else {  // flash is too old or we can't detect the plugin
-    var alternateContent = 'Alternate HTML content should be placed here. '
-  	+ 'This content requires the Adobe Flash Player. '
-   	+ '<a href=http://www.adobe.com/go/getflash/>Get Flash</a>';
-    document.write(alternateContent);  // insert non-flash content
-  }
-// -->
-</script>
-<noscript>
-  	<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
-			id="flare_visualization" width="<?php echo $visual->width; ?>" height="<?php echo $visual->height; ?>"
-			codebase="http://fpdownload.macromedia.com/get/flashplayer/current/swflash.cab">
-            <param name="flashVars" value="<?php echo $flashvarshtml;?>" />
-			
-            <param name="movie" value="flare_visualization.swf" />
-			<param name="quality" value="<?php echo $visual->quality ?>" />
-			<param name="bgcolor" value="#<?php echo $visual->backgroundcolor ?>" />
-			<param name="allowScriptAccess" value="sameDomain" />
-			<embed src="flare_visualization.swf" quality="high" bgcolor="#<?php echo $visual->backgroundcolor ?>"
-			    flashVars="<?php echo $flashvarshtml; ?>" 
-				framerate="<?php echo $visual->framerate ?>"
-				width="<?php echo $visual->width; ?>" height="<?php echo $visual->height; ?>" name="flare_visualization" align="middle"
-				play="true"
-				loop="false"
-				quality="<?php echo $visual->quality ?>"
-				allowScriptAccess="sameDomain"
-				type="application/x-shockwave-flash"
-				pluginspage="http://www.adobe.com/go/getflashplayer">
-			</embed>
-	</object>
-</noscript>
-</div>
\ No newline at end of file
diff --git a/grade/report/visual/index.php b/grade/report/visual/index.php
deleted file mode 100644
index 0ff4f4485c..0000000000
--- a/grade/report/visual/index.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.org                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-/**
-* Index page for the visual grade book report.
-*/
-
-require_once '../../../config.php';
-require_once $CFG->libdir.'/gradelib.php';
-require_once $CFG->dirroot.'/grade/lib.php';
-require_once $CFG->dirroot.'/grade/report/visual/lib.php';
-
-$courseid = required_param('id', PARAM_INT);
-$visid    = optional_param('visid', '', PARAM_ACTION);
-
-/// basic access checks
-if (!$course = $DB->get_record('course', array('id' => $courseid))) {
-    print_error('nocourseid');
-}
-require_login($course);
-$context = get_context_instance(CONTEXT_COURSE, $course->id);
-require_capability('gradereport/visual:view', $context);
-
-/// get tracking object
-$gpr = new grade_plugin_return(array('type'=>'report', 'plugin'=>'visual', 'courseid'=>$courseid));
-
-/// get the visual report object.
-$report = new grade_report_visual($courseid, $gpr, $context, $visid);
-
-/// make sure the user is allowed to view the selected visualization.
-require_capability(grade_report_visual::get_visualization($report->visid, $context)->capability, $context);
-
-/// last selected report session tracking
-if (!isset($USER->grade_last_report)) {
-    $USER->grade_last_report = array();
-}
-$USER->grade_last_report[$course->id] = 'visual';
-
-$reportname = get_string('modulename', 'gradereport_visual');
-print_grade_page_head($COURSE->id, 'report', 'visual', $reportname);
-
-/// Make and output the html for the report.
-$report->visualization_selector();
-$report->adapt_html();
-
-/// Print footer
-print_footer($course);
-?>
diff --git a/grade/report/visual/lang/en_utf8/gradereport_visual.php b/grade/report/visual/lang/en_utf8/gradereport_visual.php
deleted file mode 100755
index c85a688a7d..0000000000
--- a/grade/report/visual/lang/en_utf8/gradereport_visual.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.org                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-$string['modulename'] = 'Visual Report';
-$string['visual:view'] = 'View visual course report';
-
-$string['visualselector'] = 'Visualization:';
-$string['nogroup'] = 'No Group';
-$string['allgroups'] = 'All Groups';
-$string['printable'] = 'Printer Friendly Version';
-
-$string['preferences'] = 'Visual report preferences';
-
-/// settings
-$string['prefgeneral'] = 'General';
-$string['prefcalc'] = 'Calculations';
-$string['aggregationview'] = 'Aggregation view';
-$string['aggregationposition'] = 'Aggregation position';
-$string['incompleasmin'] = 'Incomplete grades as min';
-$string['usehidden'] = 'Count hidden grades';
-$string['uselocked'] = 'Count locked grades';
-$string['showscaleitems'] = 'Show items using scale';
-$string['showvalueitems'] = 'Show items using value';
-
-/// buttons text
-$string['hide'] = 'Hide';
-$string['show'] = 'Show';
-$string['xlabels'] = 'X Labels';
-$string['ylabels'] = 'Y Labels';
-$string['axes'] = 'Axes';
-$string['invertaxes'] = 'Invert Axes';
-
-/// common axis labels
-$string['grade'] = 'Grade';
-$string['student'] = 'Student';
-$string['item'] = 'Item';
-$string['numberstudents'] = 'Number of Students';
-$string['percentstudents'] = 'Percent Students';
-
-/// grades_vs_students strings
-$string['gradesvsstudents'] = 'Normalized Grades vs Students';
-$string['gradesvsstudents:title'] = 'Normalized Grades vs Students';
-$string['visual:vis:grades_vs_students'] = 'View Grades vs Students Visualization';
-
-/// grade_distribution strings
-$string['gradedistribution:title'] = 'Grade Distribution';
-$string['gradedistribution'] = 'Grade Distribution (Line)';
-$string['visual:vis:grade_distribution'] ='View Grade Distribution Visualization';
-
-/// grade_distribution_bar strings
-$string['gradedistributionbar'] = 'Grade Distribution by Item (Bar)';
-$string['visual:vis:grade_distribution_bar'] = 'View Grade Distribution Bar Visualization';
-
-/// grade_distribution_group_bar
-$string['gradedistributiongroupbar'] = 'Grade Distribution by Group (Bar)';
-$string['visual:vis:grade_distribution_group_bar'] = 'View Grade Distribution by Group Visualization';
-
-/// continuous_grade_distribution
-$string['continuousgradedistribution'] = 'Continuous Grade Distribution';
-$string['visual:vis:continuous_grade_distribution'] = 'View Continuous Grade Distribution Visualization';
-
-/// grades_vs_items
-$string['gradesvsitems'] = 'Average Grades vs Items';
-$string['gradesvsitems:title'] = 'Average Grades vs Items';
-$string['visual:vis:grades_vs_items'] = 'View Grades vs Items Visualization';
-
-?>
diff --git a/grade/report/visual/lib.php b/grade/report/visual/lib.php
deleted file mode 100755
index d02796779b..0000000000
--- a/grade/report/visual/lib.php
+++ /dev/null
@@ -1,488 +0,0 @@
-<?php
- ///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.org                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
- /**
-  * File in whiich the grade_report_visual class is defined.
-  * @package gradebook
-  */
-
-require_once($CFG->dirroot . '/grade/report/lib.php');
-require_once($CFG->libdir.'/tablelib.php');
-
-/// Require all visualization classes
-foreach (glob($CFG->dirroot . '/grade/report/visual/visualizations/visual_*.php') as $filename) {
-   require_once($filename);
-}
-
-/**
- * Class providing the API for the visual report, including harvesters,
- * reports, and adaptor methods for turing grades in to visualizations.
- * @uses grade_report
- * @package gradebook
- */
-class grade_report_visual extends grade_report {
-    /**
-     * Capability to view hidden items.
-     * @var bool $canviewhidden
-     */
-    public $canviewhidden;
-
-    /**
-     * Array of visualizations available.
-     * @var array $visualizations
-     */
-    private static $visualizations = array();
-
-    /**
-     * Grade objects of users in the course
-     * @var array $grades
-     */
-    public $grades = array();
-
-    /**
-     * Array of data to be sent to the flash front end.
-     * Data is generated from grades as needed using
-     * report_data function and $visid.
-     * @var array $visdata
-     */
-    private $visdata = array();
-
-    /**
-     * The id of the visualization that has been selected.
-     * @var string $visid
-     */
-    public $visid;
-
-    /**
-     * Array of flashvars to be sent to flash front end.
-     * @var array $flashvars
-     */
-    private $flashvars = array();
-
-
-    private $flashvarshtml;
-
-    /**
-     * The html of the report to output.
-     * @var string $html
-     */
-    public $html;
-
-
-    /**
-     * Constructor. Initialises grade_tree, sets up group, baseurl
-     * and pbarurl.
-     * @param int $courseid the coures id for the report
-     * @param object $gpr grade plugin tracking object
-     * @context string $context
-     */
-    public function __construct($courseid, $gpr, $context, $visid=null) {
-        global $CFG;
-        parent::__construct($courseid, $gpr, $context, null);
-
-        $this->canviewhidden = has_capability('moodle/grade:viewhidden', get_context_instance(CONTEXT_COURSE, $this->course->id));
-
-        /// Set up urls
-        $this->baseurl = 'index.php?id=' . $this->courseid;
-        $this->pbarurl = 'index.php?id=' . $this->courseid;
-
-        /// Set the position of the aggregation categorie based on pref
-        $switch = $this->get_pref('visual', 'aggregationposition');
-        if ($switch == '' && isset($CFG->grade_aggregationposition)) {
-            $switch = grade_get_setting($this->courseid, 'aggregationposition', $CFG->grade_aggregationposition);
-        }
-
-        /// Build grade tree
-        $this->gtree = new grade_tree($this->courseid, false, $switch);
-
-        $this->load_visualizations();
-
-        if(!is_null($visid) && !empty($visid) && array_key_exists($visid,  grade_report_visual::$visualizations)) {
-            $this->visid = $visid;
-        } else {
-            $keys = array_keys(grade_report_visual::$visualizations);
-            $this->visid = $keys[0];
-        }
-
-        $this->set_up_flashvars();
-
-        /// Set up Groups
-        if($this->visid && grade_report_visual::get_visualization($this->visid)->usegroups) {
-            $this->setup_groups();
-        }
-    }
-
-    /// Added to keep grade_report happy
-    public function process_data($data){}
-    public function process_action($target, $action){}
-
-    /**
-     * Load all the visualization classes into $visualizations.
-     * Looks in /visualizations and trys to make an instence of any
-     * class that is in a file that starts with visual_ and extends
-     * visualization directly.
-     * @param bool $return if true return visualizations array, else store in $this->visualizations
-     * @param object $context the context to use for checking if a user has access to view a visualization.
-     * @returns array array of clases that extend visualization
-     */
-    private function load_visualizations($return=false, $context = null) {
-        global $CFG;
-
-        if($context == null) {
-            $context = $this->context;
-        }
-
-        if(!isset(grade_report_visual::$visualizations) || is_null(grade_report_visual::$visualizations) || empty(grade_report_visual::$visualizations)) {
-            $visualizations = array();
-
-            foreach (glob($CFG->dirroot . '/grade/report/visual/visualizations/visual_*.php') as $path) {
-                $filename = substr(basename($path, '.php'), 7);
-
-                if(class_exists($filename) && get_parent_class($class = new $filename) == 'visualization' ) {
-                    if($class->capability == null || has_capability($class->capability, $context)) {
-                        $visualizations[$filename] = $class;
-                    }
-                }
-            }
-
-            if($return) {
-                return $visualizations;
-            } else {
-                grade_report_visual::$visualizations = $visualizations;
-            }
-        } else if($return) {
-            return grade_report_visual::$visualizations;
-        }
-    }
-
-    /**
-     * Returns the current visualizations being used in the report
-     * or if none are set, it returns the them as whould be loaded
-     *  by load_visualizations.
-     * @param object $context the context to use for checking if a user has access to view a visualization.
-     * @returns array array of classes that extend visualization
-     */
-    public function get_visualizations($context=null) {
-        if(!isset(grade_report_visual::$visualizations) || is_null(grade_report_visual::$visualizations) || empty(grade_report_visual::$visualizations)) {
-            return grade_report_visual::load_visualizations(true, $context);
-        } else {
-            return grade_report_visual::$visualizations;
-        }
-    }
-
-    /**
-     * Returns a specified visulization object.
-     * @param object $context the context to use for checking if a user has access to view the visualization.
-     * @returns object visulization object or null if the visulization does not exist or the user does not have access to view it in the given context.
-     */
-    public function get_visualization($filename, $context=null) {
-        if($context == null) {
-            $context = $this->context;
-        }
-
-        if(!isset(grade_report_visual::$visualizations) || is_null(grade_report_visual::$visualizations) || empty(grade_report_visual::$visualizations) || is_null(grade_report_visual::$visualizations[$filename])) {
-            if(class_exists($filename) && get_parent_class($class = new $filename) == 'visualization' ) {
-                if($class->capability == null || has_capability($class->capability, $context)) {
-                    return $class;
-                } else {
-                    return null;
-                }
-            } else {
-                return null;
-            }
-        } else {
-            return grade_report_visual::$visualizations[$filename];
-        }
-    }
-
-    /**
-     * Based on load user function from grader report.
-     * Pulls out the userids of the users to be used in the stats.
-     * @return array array of user ids to use in stats
-     */
-    public function load_users() {
-        global $CFG, $DB;
-
-        $params = array();
-        list($usql, $gbr_params) = $DB->get_in_or_equal(explode(',', $this->gradebookroles));
-
-        $sql = "SELECT u.id, u.firstname, u.lastname, u.imagealt, u.picture, u.idnumber, u.username
-                FROM {user} u
-                    JOIN {role_assignments} ra ON u.id = ra.userid
-                    $this->groupsql
-                WHERE ra.roleid $usql
-                    $this->groupwheresql
-                    AND ra.contextid ".get_related_contexts_string($this->context);
-
-        $params = array_merge($gbr_params, $this->groupwheresql_params);
-        $this->users = $DB->get_records_sql($sql, $params);
-
-        if (empty($this->users)) {
-            $this->userselect = '';
-            $this->users = array();
-            $this->userselect_params = array();
-        } else {
-            list($usql, $params) = $DB->get_in_or_equal(array_keys($this->users));
-            $this->userselect = "AND g.userid $usql";
-            $this->userselect_params = $params;
-        }
-
-        return $this->users;
-    }
-
-    /**
-     * Harvest the grades from the data base and build the finalgrades array.
-     * Filters out hidden, locked and null grades based on users settings.
-     * Partly based on grader reports load_final_grades function.
-     */
-    public function harvest_data() {
-        global $CFG, $DB;
-
-        $params = array();
-
-        $params = array_merge(array($this->courseid), $this->userselect_params);
-
-        /// please note that we must fetch all grade_grades fields if we want to contruct grade_grade object from it!
-        $sql = "SELECT g.*
-              FROM {grade_items} gi,
-                   {grade_grades} g
-             WHERE g.itemid = gi.id AND gi.courseid = ? {$this->userselect}";
-
-        $grades = $DB->get_records_sql($sql, $params);
-
-        $userids = array_keys($this->users);
-
-        if ($grades) {
-            foreach ($grades as $graderec) {
-                if (in_array($graderec->userid, $userids) && array_key_exists($graderec->itemid, $this->gtree->items)) { // some items may not be present!!
-                    $grade = new grade_grade($graderec, false);
-                    $grade->grade_item =& $this->gtree->items[$graderec->itemid];
-                    if((($grade->is_hidden() && $this->canviewhidden && ($this->get_pref('visual', 'usehidden') || is_null($this->get_pref('visual', 'usehidden')))) || !$grade->is_hidden())
-                        && (($grade->is_locked() && ($this->get_pref('visual', 'uselocked') || is_null($this->get_pref('visual', 'uselocked')))) || !$grade->is_locked())) {
-                            $this->grades[$graderec->itemid][$graderec->userid] = $grade;
-                    }
-                }
-            }
-        }
-
-        if($this->get_pref('visual', 'incompleasmin')) {
-        /// prefil grades that do not exist yet
-            foreach ($userids as $userid) {
-                foreach ($this->gtree->items as $itemid=>$unused) {
-                    if (!isset($this->grades[$itemid][$userid])) {
-                        $grade = new grade_grade();
-                        $grade->itemid = $itemid;
-                        $grade->userid = $userid;
-                        $grade->grade_item =& $this->gtree->items[$itemid]; // db caching
-                        $grade->finalgrade = $this->gtree->items[$itemid]->grademin;
-
-                        if((($grade->is_hidden() && $this->canviewhidden && ($this->get_pref('visual', 'usehidden') || is_null($this->get_pref('visual', 'usehidden')))) || !$grade->is_hidden())
-                            && (($grade->is_locked() && ($this->get_pref('visual', 'uselocked') || is_null($this->get_pref('visual', 'uselocked')))) || !$grade->is_locked())) {
-                                $this->grades[$itemid][$userid] = $grade;
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-    * Generates the data for a visualization or all visualizations to be sent to
-    * the front end.
-    * @param bool $all if true loads the data for all visualizations into visdata, else loads only the visualization selected by visid.
-    */
-    public function report_data($all = false) {
-        if($all) {
-            $visuals = $this->get_visualizations();
-
-            foreach($visuals as $key=>$visual) {
-                $this->visdata[$key] = $visual->report_data($this);
-            }
-        } else {
-            $visual = $this->get_visualization($this->visid);
-            $this->visdata[$this->visid] = $visual->report_data($this);
-        }
-    }
-
-    /**
-     * Generates the values of the flashvars that will be sent to the
-     * flash front end and encodes them as html in flashvarshtml so
-     * they can be droped in to the flash tag.
-     */
-    private function set_up_flashvars() {
-        global $USER, $SESSION, $CFG;
-
-        $flashvars = array();
-        $flashvars['username'] = $USER->username;
-        $flashvars['userid'] = $USER->id;
-        $flashvars['courseid'] = $this->courseid;
-        $flashvars['coursefullname'] = $this->course->fullname;
-        $flashvars['courseshortname'] = $this->course->shortname;
-        $flashvars['sessionid'] = session_id();
-        $flashvars['sessioncookie'] = $CFG->sessioncookie;
-        // $flashvars['sessiontest'] = $SESSION->session_test; // This session variable no longer exists in 2.0
-        $flashvars['dirroot'] = $CFG->dirroot;
-        $flashvars['wwwroot'] = $CFG->wwwroot;
-        $flashvars['visid'] = $this->visid;
-
-        foreach($flashvars as $key=>$val) {
-            $this->flashvarshtml .= $key. '=' . addslashes(urlencode(strip_tags($val))) . '&';
-        }
-        $this->flashvarshtml = substr($this->flashvarshtml, 0, strlen($this->flashvarshtml) - 1);
-    }
-
-    /**
-     * Returns or prints html for the report.
-     * HTML produced is based on flex.php and the values in this calss.
-     * @param bool $printerversion if true the HTML will be for the printerversion of the report.
-     * @param bool $return if true the HTML will be returned as a string rather then echoed.
-     * @returns string if $return is true a string of the HTML will be retruned.
-     */
-    public function adapt_html($printerversion = false, $return = false) {
-        global $CFG;
-
-        $flashvarshtml = $this->flashvarshtml;
-        $visual = $this->get_visualization($this->visid);
-
-        if($printerversion) {
-            $flashvarshtml .= '&printerversion=true';
-        } else {
-            $flashvarshtml .= '&printerversion=false';
-        }
-
-        ob_start();
-        require($CFG->dirroot.'/grade/report/visual/flex.php');
-        $this->html = ob_get_clean();
-
-        if($return) {
-            return $this->html;
-        } else {
-            echo $this->html;
-        }
-    }
-
-    /**
-     * Adapts $visdata to a fromat that can be read by the flash front end.
-     * TODO: Have options for diffrent fromats rather then just tab format.
-     * @param bool $return if true the data is returned in a string, else it is echoed.
-     * @returns string if $return is true a string of the adapted data will be returned.
-     */
-    public function adapt_data($return = false) {
-        if($return) {
-            return $this->get_tab(true);
-        } else {
-            echo $this->get_tab(true);
-        }
-    }
-
-    /**
-     * Generates the HTML for a selector feild witch lists the visualizations avaible
-     * to the current user.
-     * @param bool $return if true the HTML is retruned as a string, otherwise it is echoed.
-     * @returns string if $return is true, the HTML is returned as a string.
-     */
-    public function visualization_selector($return = false) {
-        $visuals = $this->get_visualizations();
-        $visualmenu = array();
-        $vislabel = $this->get_lang_string('visualselector', 'gradereport_visual');
-
-        foreach($visuals as $key=>$visual) {
-            $visualmenu[$key] = format_string($visual->name);
-        }
-
-        if(count($visualmenu) > 1) {
-            $selectorhtml =  popup_form($this->pbarurl . '&amp;visid=', $visualmenu, 'selectvisual', $this->visid, '', '', '', true, 'self', $vislabel);
-        } else {
-            $selectorhtml = '';
-        }
-
-        if($return) {
-            return $selectorhtml;
-        } else {
-            echo $selectorhtml;
-        }
-    }
-
-    /**
-     * Truncates a string to $max chars long and adds $end to the string
-     * if it is more then $max chars. The resulting string will allways be at
-     * most $max chars long. $end must be shorter then $max long.
-     * @param string $string the string to truncate.
-     * @param int $max the maxium length of the string.
-     * @param string $end a string that will be appened to the end of the truncated string if it is over $max in length.
-     * @returns string returns the truncated string if $string is over $max in length, other wise returns $string.
-     */
-    public static function truncate($string, $max = 25, $end = '...') {
-        if(strlen($string) <= $max) {
-            return $string;
-        }
-
-        return substr_replace($string, $end, $max - strlen($end));
-    }
-
-    /**
-     * Returns the data for a visulasation in tab format.
-     * @param boolean $return if true return a string, other wise echo the data.
-     * @return string If return is set to true, returns a string of the data in tab format.
-     */
-    private function get_tab($return = true) {
-        if ($return) {
-            return $this->tab_encode($this->visdata[$this->visid]);
-        } else {
-            echo $this->tab_encode($this->visdata[$this->visid]);
-        }
-    }
-
-    /**
-     * Encodes an array to a string using the tab format.
-     *@param array $data the array to encode.
-     *@return string a string encoded in tab format based on the given array.
-     */
-    public static function tab_encode(array $data, $useindexes = false) {
-        $outstring = '';
-
-        foreach($data as $key=>$row) {
-            if(is_array($row)) {
-                if($useindexes) {
-                    $outstring .= $key . "\t";
-                }
-
-                foreach($row as $col) {
-                    $outstring .= $col . "\t";
-                }
-
-                $outstring[strlen($outstring) - 1] = "\n";
-            } else {
-                if($useindexes) {
-                    $outstring .= $key . "\t" . $row . "\n";
-                } else {
-                    $outstring .= $row . "\n";
-                }
-            }
-        }
-
-        return $outstring;
-    }
-}
-?>
diff --git a/grade/report/visual/playerProductInstall.swf b/grade/report/visual/playerProductInstall.swf
deleted file mode 100644
index bdc3437856..0000000000
Binary files a/grade/report/visual/playerProductInstall.swf and /dev/null differ
diff --git a/grade/report/visual/preferences.php b/grade/report/visual/preferences.php
deleted file mode 100755
index 187d2e315b..0000000000
--- a/grade/report/visual/preferences.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.org                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-/**
- * Preferences page for the visual report plugin.
- * Based on the stats report plugin.
- * @package gradebook
- */
-
-require_once '../../../config.php';
-require_once $CFG->libdir . '/gradelib.php';
-require_once $CFG->dirroot.'/grade/lib.php';
-
-$courseid = required_param('id', PARAM_INT);
-
-
-/// Make sure they can even access this course
-if (!$course = $DB->get_record('course', array('id' => $courseid))) {
-    print_error('nocourseid');
-}
-
-require_login($course);
-
-$context = get_context_instance(CONTEXT_COURSE, $course->id);
-$systemcontext = get_context_instance(CONTEXT_SYSTEM);
-require_capability('gradereport/visual:view', $context);
-
-
-require('preferences_form.php');
-$mform = new visual_report_preferences_form('preferences.php', compact('course'));
-
-// If data submitted, then process and store.
-if ($data = $mform->get_data()) {
-    foreach ($data as $preference => $value) {
-        if (substr($preference, 0, 19) !== 'grade_report_visual') {
-            continue;
-        }
-
-        if ($value == GRADE_REPORT_PREFERENCE_DEFAULT || strlen($value) == 0) {
-            unset_user_preference($preference);
-        } else {
-            set_user_preference($preference, $value);
-        }
-    }
-
-    redirect($CFG->wwwroot . '/grade/report/visual/index.php?id='.$courseid); // message here breaks accessability and is sloooowww
-    exit;
-}
-
-/// If cancelled go back to report
-if ($mform->is_cancelled()){
-    redirect($CFG->wwwroot . '/grade/report/visual/index.php?id='.$courseid);
-}
-
-$strvisualreport = get_string('modulename', 'gradereport_visual');
-
-print_grade_page_head($COURSE->id, 'preferences', 'visual', $strvisualreport . ' ' . get_string('preferences'));
-
-/// If USER has admin capability, print a link to the site config page for this report
-/// TODO: Add admin config page for this report
-if (has_capability('moodle/site:config', $systemcontext)) {
-    echo '<div id="siteconfiglink"><a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/settings.php?section=gradereportvisual">';
-    echo get_string('changereportdefaults', 'grades');
-    echo "</a></div>\n";
-}
-
-print_simple_box_start("center");
-
-$mform->display();
-print_simple_box_end();
-
-print_footer($course);
-?>
diff --git a/grade/report/visual/preferences_form.php b/grade/report/visual/preferences_form.php
deleted file mode 100755
index 8050acf501..0000000000
--- a/grade/report/visual/preferences_form.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.org                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-/**
- * FIle with class defition for visual_report_preferences_form.
- * Used by preferences.php
- * @package gradebook
- */
-
-require_once($CFG->libdir.'/formslib.php');
-/**
- * Moodle form to be used to set user preferences for report/visual
- * gradebook plugin.
- * @uses moodleform
- */
-class visual_report_preferences_form extends moodleform {
-
-    /**
-     * Fourm definition.
-     */
-    public function definition() {
-        global $USER, $CFG;
-        
-        $mform    =& $this->_form;
-        $course   = $this->_customdata['course'];
-	
-        $context = get_context_instance(CONTEXT_COURSE, $course->id);
-        $systemcontext = get_context_instance(CONTEXT_SYSTEM);
-        $stryes                 = get_string('yes');
-        $strno                  = get_string('no');
-
-        $checkbox_default = array(GRADE_REPORT_PREFERENCE_DEFAULT => '*default*', 0 => $strno, 1 => $stryes);
-	
-        $advanced = array();
-        $preferences = array();
-	
-        /*$preferences['prefgeneral'] = array(
-                            'aggregationview'     => array(GRADE_REPORT_PREFERENCE_DEFAULT => '*default*',
-                                                         GRADE_REPORT_AGGREGATION_VIEW_FULL => get_string('fullmode', 'grades'),
-                                                         GRADE_REPORT_AGGREGATION_VIEW_AGGREGATES_ONLY => get_string('aggregatesonly', 'grades'),
-                                                         GRADE_REPORT_AGGREGATION_VIEW_GRADES_ONLY => get_string('gradesonly', 'grades')
-                            ),
-			  
-                            'aggregationposition' => array(GRADE_REPORT_PREFERENCE_DEFAULT => '*default*',
-                                                                       GRADE_REPORT_AGGREGATION_POSITION_FIRST => get_string('positionfirst', 'grades'),
-                                                                       GRADE_REPORT_AGGREGATION_POSITION_LAST => get_string('positionlast', 'grades')
-                            )
-        );*/
-        
-        $preferences['prefcalc']['incompleasmin']  = $checkbox_default;
-        $preferences['prefcalc']['usehidden']  = $checkbox_default;
-        $preferences['prefcalc']['uselocked']  = $checkbox_default;
-	
-        foreach ($preferences as $group => $prefs) {
-            $mform->addElement('header', $group, get_string($group, 'gradereport_visual'));
-
-            foreach ($prefs as $pref => $type) {
-                $full_pref  = 'grade_report_visual' . $pref;
-                $pref_value = get_user_preferences($full_pref);
-		
-                $options = $type;
-                $type = 'select';
-		
-                if (!empty($CFG->{$full_pref})) {
-                    $course_value = grade_get_setting($course->id, $pref, $CFG->{$full_pref});
-                } else {
-                    $course_value = null;
-                }
-		
-                if ($pref == 'aggregationposition') {
-                    if (!empty($options[$course_value])) {
-                        $default = $options[$course_value];
-                    } elseif(isset($CFG->grade_aggregationposition)) {
-                        $default = $options[$CFG->grade_aggregationposition];
-                    }
-                } elseif ($pref == 'aggregationview' && isset($CFG->grade_report_aggregationview) && isset($options[$CFG->grade_report_aggregationview])) {
-                    $default = $options[$CFG->grade_report_aggregationview];
-                } else {
-                    if (!empty($options[$course_value])) {
-                        $default = $options[$course_value];
-                    } else {
-                        if ($pref == 'incompleasmin') {
-                            $default = $strno;
-                        } else {
-                            $default = $stryes;
-                        }
-                    }
-                }
-		
-                $help_string = get_string("config$pref", 'gradereport_visual');
-		
-                // Replace the '*default*' value with the site default language string - 'default' might collide with custom language packs
-                if (!is_null($options) AND isset($options[GRADE_REPORT_PREFERENCE_DEFAULT]) && $options[GRADE_REPORT_PREFERENCE_DEFAULT] == '*default*') {
-                    $options[GRADE_REPORT_PREFERENCE_DEFAULT] = get_string('reportdefault', 'grades', $default);
-                } elseif ($type == 'text') {
-                    $help_string = get_string("config{$pref}default", 'gradereport_visual', $default);
-                }
-
-                $label = get_string($pref, 'gradereport_visual');
-
-                $mform->addElement($type, $full_pref, $label, $options);
-                $mform->setHelpButton($full_pref, array('visual' . $pref, get_string($pref, 'gradereport_visual'), 'grade'), true);
-                $mform->setDefault($full_pref, $pref_value);
-                $mform->setType($full_pref, PARAM_ALPHANUM);
-            }
-        }
-
-        $mform->addElement('hidden', 'id');
-        $mform->setType('id', PARAM_INT);
-        $mform->setDefault('id', $course->id);
-
-        $this->add_action_buttons();
-    }
-}
-
-?>
diff --git a/grade/report/visual/print.php b/grade/report/visual/print.php
deleted file mode 100644
index 860aabc7d5..0000000000
--- a/grade/report/visual/print.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.org                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-/**
-* Printable version of the visual report.
-*/
-
-require_once '../../../config.php';
-require_once $CFG->libdir.'/gradelib.php';
-require_once $CFG->dirroot.'/grade/lib.php';
-require_once $CFG->dirroot.'/grade/report/visual/lib.php';
-
-$courseid = required_param('id', PARAM_INT);
-$visid    = optional_param('visid', '', PARAM_ACTION);
-
-/// basic access checks
-if (!$course = $DB->get_record('course', array('id' => $courseid))) {
-    print_error('nocourseid');
-}
-require_login($course);
-$context = get_context_instance(CONTEXT_COURSE, $course->id);
-require_capability('gradereport/visual:view', $context);
-
-/// get tracking object
-$gpr = new grade_plugin_return(array('type'=>'report', 'plugin'=>'visual', 'courseid'=>$courseid));
-
-/// get the visual report object.
-$report = new grade_report_visual($courseid, $gpr, $context, $visid);
-
-/// make sure the user is allowed to view the selected visualization.
-require_capability(grade_report_visual::get_visualization($report->visid, $context)->capability, $context);
-
-/// last selected report session tracking
-if (!isset($USER->grade_last_report)) {
-    $USER->grade_last_report = array();
-}
-$USER->grade_last_report[$course->id] = 'visual';
-
-$reportname = get_string('modulename', 'gradereport_stats');
-
-/// Print report
-echo '<html><title>' . $reportname . ' for '  . $course->shortname .  '</title><body>';
-echo '<div style="font-size:25px; text-align:center; font-weight:bold">' . $course->fullname . ': ' . $reportname. '</div>';
-echo '<div style="text-align:center;">' . userdate(time()) . '</div>';
-echo '<br/><br/>';
-$report->adapt_html(true);
-echo '</body></html>';
-?>
\ No newline at end of file
diff --git a/grade/report/visual/tabs.php b/grade/report/visual/tabs.php
deleted file mode 100644
index b876d14513..0000000000
--- a/grade/report/visual/tabs.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.org                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-
-$row = $tabs = array();
-    $tabcontext = get_context_instance(CONTEXT_COURSE, $COURSE->id);
-   
-
-    if(!isset($visid)){
-        $visid = optional_param('visid');
-    }
-
-
-    $row[] = new tabobject('visualreport',
-                           $CFG->wwwroot.'/grade/report/visual/index.php?id='.$courseid.'&visid='.$visid,
-                           get_string('modulename', 'gradereport_visual'));
-    
-    if (has_capability('moodle/grade:manage',$tabcontext ) ||
-        has_capability('moodle/grade:edit', $tabcontext) ||
-        has_capability('gradereport/visual:view', $tabcontext)) {
-        $row[] = new tabobject('preferences',
-                               $CFG->wwwroot.'/grade/report/visual/preferences.php?id='.$courseid.'&visid='.$visid,
-                               get_string('myreportpreferences', 'grades'));
-    }
-
-    /// A bit of a hack to make the printable tab open a new window.
-    $row[] = new tabobject('printable',
-                           '#" onClick="javascript:window.open(\'' . $CFG->wwwroot. '/grade/report/visual/print.php?id=' . $courseid . '&visid=' . $visid . '\')',
-                           get_string('printable', 'gradereport_visual'));
-
-    $tabs[] = $row;
-    echo '<div class="gradedisplay">';
-    print_tabs($tabs, $currenttab);
-    echo '</div>';
-?>
diff --git a/grade/report/visual/version.php b/grade/report/visual/version.php
deleted file mode 100755
index df63a8afd9..0000000000
--- a/grade/report/visual/version.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?PHP 
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.org                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-$plugin->version  = 2008061400;
-$plugin->requires = 2008051202;
-
-?>
diff --git a/grade/report/visual/visual_settings.php b/grade/report/visual/visual_settings.php
deleted file mode 100644
index befd068016..0000000000
--- a/grade/report/visual/visual_settings.php
+++ /dev/null
@@ -1,247 +0,0 @@
-<?php
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.org                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-/**
- * Generates XML output that describes a visualization and is
- * sent to the flash/flex front end. The output is based on the
- * visualizations classes found in ./visualizations
- */
-
-// TODO: This needs to be replaced by web service user keys
-
-
-/// Get a session id from the URI request and make a cookie
-/// for it temparaly. This is needed as the flex application will
-/// not have the users oringal cookie and only the session information
-/// witch is passed to it.
-$cookiewasset = false;
-if(empty($_COOKIE) && isset($_GET['sessionid']) && isset($_GET['sessioncookie']) && isset($_GET['sessiontest'])) {
-    $_COOKIE['MoodleSession' . $_GET['sessioncookie']] = $_GET['sessionid'];
-    $_COOKIE['MoodleSessionTest' . $_GET['sessioncookie']] = $_GET['sessiontest'];
-    $cookiewasset = true;
-}
-
-require_once '../../../config.php';
-require_once $CFG->dirroot.'/grade/report/visual/lib.php';
-require_once $CFG->libdir.'/phpxml/xml.php';
-
-$visname  = required_param('visid', PARAM_ACTION);
-$courseid = required_param('id', PARAM_INT);
-
-/// basic access checks
-if (!$course = $DB->get_record('course', array('id' => $courseid))) {
-    print_error('nocourseid');
-}
-require_login($course);
-$context = get_context_instance(CONTEXT_COURSE, $course->id);
-require_capability('gradereport/visual:view', $context);
-
-$vis = grade_report_visual::get_visualization($visname, $context);
-
-/// Make sure the user is allowed see this visualization
-require_capability($vis->capability, $context);
-
-/// Turn of error reporting as hummans will not be seeing 
-/// this and it will be read by the front end. Notices and 
-/// warnings will break the XML format and stop the
-/// front end from working.
-error_reporting(0);
-
-/// Define array that repersents the XML output from the
-/// visualization class selected.
-$settings = array();
-$settings['visualization'] = array();
-
-$settings['visualization']['name'] = $vis->name;
-$settings['visualization']['classname'] = get_class($vis);
-
-$settings['visualization']['layout'] = array();
-$settings['visualization']['layout']['type'] = $vis->layout;
-
-$settings['visualization']['layout']['xaxis'] = array();
-$settings['visualization']['layout']['yaxis'] = array();
-$settings['visualization']['layout']['xaxis']['field'] = 'data.' . $vis->xaxis;
-$settings['visualization']['layout']['yaxis']['field'] = 'data.' . $vis->yaxis;
-$settings['visualization']['layout']['xaxis']['labelformat'] = $vis->xaxislabelformat;
-$settings['visualization']['layout']['yaxis']['labelformat'] = $vis->yaxislabelformat;
-$settings['visualization']['layout']['xaxis']['min'] = $vis->xaxismin;
-$settings['visualization']['layout']['xaxis']['max'] = $vis->xaxismax;
-$settings['visualization']['layout']['yaxis']['min'] = $vis->yaxismin;
-$settings['visualization']['layout']['yaxis']['max'] = $vis->yaxismax;
-$settings['visualization']['layout']['yaxis']['xoffset'] =$vis->yaxisxoffset;
-$settings['visualization']['layout']['yaxis']['yoffset'] =$vis->yaxisyoffset;
-$settings['visualization']['layout']['xaxis']['xoffset'] =$vis->xaxisxoffset;
-$settings['visualization']['layout']['xaxis']['yoffset'] =$vis->xaxisyoffset;
-
-if($vis->layoutsettings != null) {
-    $settings['visualization']['layout']['setting'] = array();
-    for($i = 0; $i < count($vis->layoutsettings); $i++) {
-        $settings['visualization']['layout']['setting'][$i] = $vis->layoutsettings[$i];
-    }
-}
-
-if($vis->edges != null) {
-    $settings['visualization']['edge'] = array();
-    for($i = 0; $i < count($vis->edges); $i++) {
-        $settings['visualization']['edge'][$i] = array();
-    
-        if(is_array($vis->edges[$i]->sortby)) {
-            $settings['visualization']['edge'][$i]['sortby'] = array();
-        
-            for($k = 0; $k < count($vis->edges[$i]->sortby); $k++) {
-                $settings['visualization']['edge'][$i]['sortby'][$k] = 'data.' . $vis->edges[$i]->sortby[$k];
-            }
-        } else {
-            $settings['visualization']['edge'][$i]['sortby'] =  'data.' . $vis->edges[$i]->sortby;
-        }
-    
-        if(is_array($vis->edges[$i]->groupby)) {
-            $settings['visualization']['edge'][$i]['groupby'] = array();
-            
-            for($k = 0; $k < count($vis->edges[$i]->groupby); $k++) {
-                $settings['visualization']['edge'][$i]['groupby'][$k] = 'data.' . $vis->edges[$i]->groupby[$k];
-            }
-        } else {
-            $settings['visualization']['edge'][$i]['groupby'] = 'data.' . $vis->edges[$i]->groupby;
-        }
-    }
-}
-
-if($vis->encoders != null) {
-    $settings['visualization']['encoder'] = array();
-    for($i = 0; $i < count($vis->encoders); $i++) {
-        $settings['visualization']['encoder'][$i] = array();
-        $settings['visualization']['encoder'][$i]['id'] = $vis->encoders[$i]->id;
-        $settings['visualization']['encoder'][$i]['type'] = $vis->encoders[$i]->type;
-        $settings['visualization']['encoder'][$i]['datafield'] = 'data.' . $vis->encoders[$i]->datafield;
-        
-        if($vis->encoders[$i]->settings != null) {
-            $settings['visualization']['encoder'][$i]['setting'] = array();
-            for($j = 0; $j < count($vis->encoders[$i]->settings); $j++) {
-                $settings['visualization']['encoder'][$i]['setting'][$j] = $vis->encoders[$i]->settings[$j];
-            }
-        }
-    }
-}
-
-if($vis->legends != null) {
-    $settings['visualization']['legend'] = array();
-    for($i = 0; $i < count($vis->legends); $i++) {
-        $settings['visualization']['legend'][$i] = array();
-        $settings['visualization']['legend'][$i]['encoderid'] = $vis->legends[$i]->encoder->id;
-        $settings['visualization']['legend'][$i]['datafield'] = 'data.' . $vis->legends[$i]->encoder->datafield;
-        
-        if($vis->legends[$i]->show != null) {
-            $settings['visualization']['legend'][$i]['show'] = array();
-            for($j = 0; $j < count($vis->legends[$i]->show); $j++) {
-                $settings['visualization']['legend'][$i]['show'][$j] = $vis->legends[$i]->show[$j];
-            }
-        }
-    }
-}
-
-if($vis->selectors != null) {
-    $settings['visualization']['selector'] = array();
-    for($i = 0; $i < count($vis->selectors); $i++) {
-        $settings['visualization']['selector'][$i] = array();
-        $settings['visualization']['selector'][$i]['param'] = $vis->selectors[$i]->param;
-        $settings['visualization']['selector'][$i]['active'] = $vis->selectors[$i]->active;
-        
-        
-        if($vis->selectors[$i]->options != null) {
-            $settings['visualization']['selector'][$i]['option'] = array();
-            $k = 0;
-            foreach($vis->selectors[$i]->options as $value=>$title) {
-                $settings['visualization']['selector'][$i]['option'][$k] = array();
-                $settings['visualization']['selector'][$i]['option'][$k]['title'] = $title;
-                $settings['visualization']['selector'][$i]['option'][$k]['value'] = $value;
-                $k++;
-            }
-        }
-    }
-}
-
-/// TODO: add in capabilities data
-$settings['visualization']['capabilities'] = array();
-
-$settings['visualization']['flash'] = array();
-$settings['visualization']['flash']['width'] = $vis->width;
-$settings['visualization']['flash']['height'] = $vis->height;
-$settings['visualization']['flash']['framerate'] = $vis->framerate;
-$settings['visualization']['flash']['quality'] = $vis->quality;
-
-$settings['visualization']['labels'] = array();
-$settings['visualization']['labels']['xaxis'] = $vis->xaxislabel;
-$settings['visualization']['labels']['yaxis'] = $vis->yaxislabel;
-$settings['visualization']['labels']['title'] = $vis->title;
-
-$settings['visualization']['style'] = array();
-$settings['visualization']['style']['nodeshape'] = $vis->nodeshape;
-$settings['visualization']['style']['edgeshape'] = $vis->edgeshape;
-$settings['visualization']['style']['bgcolor'] = $vis->backgroundcolor;
-
-$settings['visualization']['style']['text'] = array();
-$settings['visualization']['style']['text']['font'] = $vis->font;
-$settings['visualization']['style']['text']['size'] = $vis->fontsize;
-
-$settings['visualization']['style']['button'] = array();
-$settings['visualization']['style']['button']['bgcolor'] = $vis->buttonbgcolor;
-$settings['visualization']['style']['button']['alpha'] = $vis->buttonbgalpha;
-$settings['visualization']['style']['button']['text'] = array();
-$settings['visualization']['style']['button']['text']['font'] = $vis->buttonfont;
-$settings['visualization']['style']['button']['text']['size'] = $vis->buttonfontsize;
-$settings['visualization']['style']['button']['line'] = array();
-$settings['visualization']['style']['button']['line']['size'] = $vis->buttonlinesize;
-$settings['visualization']['style']['button']['line']['color'] = $vis->buttonlinecolor;
-$settings['visualization']['style']['button']['line']['alpha'] = $vis->buttonlinealpha;
-
-$settings['visualization']['style']['popup'] = array();
-$settings['visualization']['style']['popup']['bgcolor'] = $vis->popupbgcolor;
-$settings['visualization']['style']['popup']['alpha'] = $vis->popupbgalpha;
-$settings['visualization']['style']['popup']['text']  = array();
-$settings['visualization']['style']['popup']['text']['font'] = $vis->popupfont;
-$settings['visualization']['style']['popup']['text']['size'] = $vis->popupfontsize;
-$settings['visualization']['style']['popup']['line'] = array();
-$settings['visualization']['style']['popup']['line']['size'] = $vis->popuplinesize;
-$settings['visualization']['style']['popup']['line']['color'] = $vis->popuplinecolor;
-$settings['visualization']['style']['popup']['line']['alpha'] = $vis->popuplinealpha;
-
-$settings['visualization']['lang'] = array();
-$settings['visualization']['lang']['hide'] = get_string('hide', 'gradereport_visual');
-$settings['visualization']['lang']['show'] = get_string('show', 'gradereport_visual');
-$settings['visualization']['lang']['xlabels'] = get_string('xlabels', 'gradereport_visual');
-$settings['visualization']['lang']['ylabels'] = get_string('ylabels', 'gradereport_visual');
-$settings['visualization']['lang']['axes'] = get_string('axes', 'gradereport_visual');
-$settings['visualization']['lang']['invertaxes'] = get_string('invertaxes', 'gradereport_visual');
-
-/// Turn array into XML string and output.
-$xml = XML_serialize($settings);
-echo $xml;
-
-/// Clean up cookie if it was created.
-if($cookiewasset) {
-    $_COOKIE['MoodleSession' . $_GET['sessioncookie']] = null;
-    $_COOKIE['MoodleSessionTest' . $_GET['sessioncookie']] = null;
-}
-?>
diff --git a/grade/report/visual/visualizations/visual_continuous_grade_distribution.php b/grade/report/visual/visualizations/visual_continuous_grade_distribution.php
deleted file mode 100644
index a21d49aab6..0000000000
--- a/grade/report/visual/visualizations/visual_continuous_grade_distribution.php
+++ /dev/null
@@ -1,205 +0,0 @@
-<?php 
- ///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.org                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-require_once $CFG->dirroot . '/grade/report/visual/visualizations/visualization.php';
-
-class continuous_grade_distribution extends visualization {
-    const RANGE = 10;
-    
-    public $percent = true;
-    
-    public $colorencodernode;
-    
-    public $colorencoderedge;
-    
-    public $shapeencodernode;
-    
-    public $shapeencoderedge;
-    
-    public $grouplegend;
-    
-    public $itemlegend;
-
-    public function __construct() {
-        parent::__construct(get_string('continuousgradedistribution', 'gradereport_visual'));
-    
-        $this->layout = visualization::LAYOUT_AXIS;
-        $this->layoutsettings = null;
-        
-        $this->edges = array(new edge('grade', array('item', 'group')));
-        
-        $this->xaxis = 'grade';
-        $this->yaxis = 'students';
-        $this->xaxislabelformat = '0\\%';
-        $this->xaxisxoffset = -27;
-        
-        $this->xaxislabel =  get_string('grade', 'gradereport_visual');
-        
-        if($this->percent) {
-            $this->yaxislabelformat = '0\\%';
-            $this->yaxislabel =  get_string('percentstudents', 'gradereport_visual');
-        } else {
-            $this->yaxislabel =  get_string('numberstudents', 'gradereport_visual');
-        }
-        
-        $this->title = get_string('continuousgradedistribution', 'gradereport_visual');
-        
-        $this->capability = 'gradereport/visual:vis:continuous_grade_distribution';
-        
-        $this->colorencoderedge = new encoder(encoder::ENCODER_COLOR, 'item', array(2));
-        $this->colorencodernode = new encoder(encoder::ENCODER_COLOR, 'item', array(1));
-        $this->shapeencodernode = new encoder(encoder::ENCODER_SHAPE, 'group', array(1));
-        $this->encoders = array($this->colorencodernode, $this->colorencoderedge, $this->shapeencodernode);
-    
-        $this->grouplegend = new legend($this->shapeencodernode, array(get_string('allgroups', 'gradereport_visual')));
-        $this->itemlegend = new legend($this->colorencodernode, array(get_string('coursetotal', 'grades')));
-        $this->legends = array($this->itemlegend, $this->grouplegend);
-    }
-    
-    public function report_data($visualreport) {
-        $data = array();
-        $data['header'] = array();
-        $data['header']['students'] = 'students';
-        $data['header']['grade'] = 'grade';
-        $data['header']['item'] = 'item';
-        $data['header']['group'] = 'group';
-        
-        $rawdata = array();
-        $counters = array();
-        $rangesize = round(100 / grade_distribution::RANGE);
-
-        foreach($visualreport->grades as $itemkey=>$itemgrades) {
-            foreach($itemgrades as $studentkey=>$studentdata) {
-                if($studentdata != null && $studentdata->finalgrade != null) {
-                    foreach(groups_get_user_groups($visualreport->courseid, $studentkey) as $grouping) {
-                        $gradelevel = floor(round($studentdata->standardise_score($studentdata->finalgrade, $visualreport->gtree->items[$itemkey]->grademin, $visualreport->gtree->items[$itemkey]->grademax, 0, 100)) / grade_distribution::RANGE);
-                        //if($gradelevel == $rangesize) {
-                        //    $gradelevel = $rangesize - 1;
-                        //}
-
-                        if(count($grouping) > 0) {
-                            foreach($grouping as $group) {
-                                if(isset($rawdata[$itemkey][$group][$gradelevel])) {
-                                    $rawdata[$itemkey][$group][$gradelevel] += 1;
-                                } else {
-                                    $rawdata[$itemkey][$group][$gradelevel] = 1;
-                                }
-                            
-                                if(isset($counters[$itemkey][$group])) {
-                                    $counters[$itemkey][$group] += 1;
-                                } else {
-                                    $counters[$itemkey][$group] = 1;
-                                }
-                            }
-                        } else {
-                            if(isset($rawdata[$itemkey]['ng'][$gradelevel])) {
-                                $rawdata[$itemkey]['ng'][$gradelevel] += 1;
-                            } else {
-                                $rawdata[$itemkey]['ng'][$gradelevel] = 1;
-                            }
-                            
-                            if(isset($counters[$itemkey]['ng'])) {
-                                $counters[$itemkey]['ng'] += 1;
-                            } else {
-                                $counters[$itemkey]['ng'] = 1;
-                            }
-                        }
-                        
-                        if(isset($rawdata[$itemkey]['ag'][$gradelevel])) {
-                            $rawdata[$itemkey]['ag'][$gradelevel] += 1;
-                        } else {
-                            $rawdata[$itemkey]['ag'][$gradelevel] = 1;
-                        }
-                        
-                        if(isset($counters[$itemkey]['ag'])) {
-                            $counters[$itemkey]['ag'] += 1;
-                        } else {
-                            $counters[$itemkey]['ag'] = 1;
-                        }
-                    }
-                }
-            }
-            
-            for($i = 0; $i <= $rangesize; $i++) {
-                foreach(groups_get_all_groups($visualreport->courseid) as $group) {
-                    if(!isset($rawdata[$itemkey][$group->id][$i])) {
-                        $rawdata[$itemkey][$group->id][$i] = 0;
-                    }
-                }
-                
-                if(!isset($rawdata[$itemkey]['ng'][$i])) {
-                    $rawdata[$itemkey]['ng'][$i] = 0;
-                }
-                
-                if(!isset($rawdata[$itemkey]['ag'][$i])) {
-                    $rawdata[$itemkey]['ag'][$i] = 0;
-                }
-            }
-        }
-        
-        $sum = array();
-        
-        foreach($rawdata as $itemkey=>$item) {
-            $sum[$itemkey] = array();
-            foreach($item as $groupkey=>$group) {
-                $sum[$itemkey][$groupkey] = 0;
-                for($gradelevel = 0; $gradelevel <= $rangesize; $gradelevel++) {
-                    $sum[$itemkey][$groupkey] += $rawdata[$itemkey][$groupkey][$gradelevel];
-                    $rawdata[$itemkey][$groupkey][$gradelevel] = $sum[$itemkey][$groupkey];
-                }
-            }
-        }
-        
-        $i = 0;
-        
-        foreach($rawdata as $itemkey=>$items) {
-            foreach($items as $groupkey=>$groups) {
-                foreach($groups as $gradelevel=>$students) {
-                    $index = $gradelevel * 10000 + $i;
-                    
-                    if($this->percent) {
-                        $data[$index]['students'] =  ($students / $counters[$itemkey][$groupkey]) * 100;
-                    } else {
-                        $data[$index]['students'] =  $students;
-                    }
-                    
-                    $data[$index]['grade'] = $gradelevel * grade_distribution::RANGE; 
-                    $data[$index]['item'] = $visualreport->gtree->items[$itemkey]->get_name();
-                    if($groupkey == 'ng') {
-                        $data[$index]['group'] = get_string('nogroup', 'gradereport_visual');
-                    } else if($groupkey == 'ag'){
-                        $data[$index]['group'] = get_string('allgroups', 'gradereport_visual');
-                    } else {
-                        $data[$index]['group'] = groups_get_group_name($groupkey);
-                    }
-                    
-                    $i++;
-                }
-            }
-        }
-        
-        return $data;
-    }
-}
-?>
\ No newline at end of file
diff --git a/grade/report/visual/visualizations/visual_grade_distribution.php b/grade/report/visual/visualizations/visual_grade_distribution.php
deleted file mode 100644
index b0a41c2702..0000000000
--- a/grade/report/visual/visualizations/visual_grade_distribution.php
+++ /dev/null
@@ -1,206 +0,0 @@
-<?php 
- ///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.org                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-require_once $CFG->dirroot . '/grade/report/visual/visualizations/visualization.php';
-
-class grade_distribution extends visualization {
-    const RANGE = 10;
-    
-    public $percent = true;
-    
-    public $colorencodernode;
-    
-    public $colorencoderedge;
-    
-    public $shapeencodernode;
-    
-    public $shapeencoderedge;
-    
-    public $grouplegend;
-    
-    public $itemlegend;
-
-    public function __construct() {
-        parent::__construct(get_string('gradedistribution', 'gradereport_visual'));
-    
-        $this->layout = visualization::LAYOUT_AXIS;
-        $this->layoutsettings = null;//array('false', 'true');
-        //$this->nodeshape = visualization::SHAPE_VERTICAL_BAR;
-        //$this->edgeshape = visualization::SHAPE_BEZIER;
-        
-        $this->edges = array(new edge('grade', array('group', 'item')));
-        
-        $this->xaxis = 'grade';
-        $this->yaxis = 'students';
-        $this->xaxislabelformat = '0\\%';
-        
-        if($this->percent) {
-            $this->yaxislabelformat = '0\\%';
-            $this->yaxislabel =  get_string('percentstudents', 'gradereport_visual');
-        } else {
-            $this->yaxislabel =  get_string('numberstudents', 'gradereport_visual');
-        }
-        
-        //$this->xaxismax = 100 + grade_distribution::RANGE;
-        //$this->xaxismin = grade_distribution::RANGE;
-        $this->xaxisxoffset = -27;
-        
-        $this->xaxislabel =  get_string('grade', 'gradereport_visual');
-        $this->title = get_string('gradedistribution:title', 'gradereport_visual');
-        
-        $this->capability = 'gradereport/visual:vis:grade_distribution';
-        
-        $this->colorencoderedge = new encoder(encoder::ENCODER_COLOR, 'item', array(2));
-        $this->colorencodernode = new encoder(encoder::ENCODER_COLOR, 'item', array(1));
-        //$this->shapeencoderedge = new encoder(encoder::ENCODER_SHAPE, 'group', array(2));
-        $this->shapeencodernode = new encoder(encoder::ENCODER_SHAPE, 'group', array(1));
-        $this->encoders = array($this->colorencodernode, $this->colorencoderedge, $this->shapeencodernode);
-    
-        $this->grouplegend = new legend($this->shapeencodernode, array(get_string('allgroups', 'gradereport_visual')));
-        $this->itemlegend = new legend($this->colorencodernode, array(get_string('coursetotal', 'grades')));
-        $this->legends = array($this->itemlegend, $this->grouplegend);
-    }
-    
-    public function report_data($visualreport) {
-        $data = array();
-        $data['header'] = array();
-        $data['header']['students'] = 'students';
-       // $data['header']['gradelevel'] = 'gradelevel';
-        $data['header']['grade'] = 'grade';
-        $data['header']['item'] = 'item';
-        $data['header']['group'] = 'group';
-        //$data['header']['range'] = 'range';
-        
-        $rawdata = array();
-        $counters = array();
-        $rangesize = round(100 / grade_distribution::RANGE);
-
-        foreach($visualreport->grades as $itemkey=>$itemgrades) {
-            foreach($itemgrades as $studentkey=>$studentdata) {
-                if($studentdata != null && $studentdata->finalgrade != null) {
-                    foreach(groups_get_user_groups($visualreport->courseid, $studentkey) as $grouping) {
-                        $gradelevel = floor(round($studentdata->standardise_score($studentdata->finalgrade, $visualreport->gtree->items[$itemkey]->grademin, $visualreport->gtree->items[$itemkey]->grademax, 0, 100)) / grade_distribution::RANGE);
-                        //if($gradelevel == $rangesize) {
-                        //    $gradelevel = $rangesize - 1;
-                        //}
-
-                        if(count($grouping) > 0) {
-                            foreach($grouping as $group) {
-                                if(isset($rawdata[$gradelevel][$itemkey][$group])) {
-                                    $rawdata[$gradelevel][$itemkey][$group] += 1;
-                                } else {
-                                    $rawdata[$gradelevel][$itemkey][$group] = 1;
-                                }
-                            
-                                if(isset($counters[$itemkey][$group])) {
-                                    $counters[$itemkey][$group] += 1;
-                                } else {
-                                    $counters[$itemkey][$group] = 1;
-                                }
-                            }
-                        } else {
-                            if(isset($rawdata[$gradelevel][$itemkey]['ng'])) {
-                                $rawdata[$gradelevel][$itemkey]['ng'] += 1;
-                            } else {
-                                $rawdata[$gradelevel][$itemkey]['ng'] = 1;
-                            }
-                            
-                            if(isset($counters[$itemkey]['ng'])) {
-                                $counters[$itemkey]['ng'] += 1;
-                            } else {
-                                $counters[$itemkey]['ng'] = 1;
-                            }
-                        }
-                        
-                        if(isset($rawdata[$gradelevel][$itemkey]['ag'])) {
-                            $rawdata[$gradelevel][$itemkey]['ag'] += 1;
-                        } else {
-                            $rawdata[$gradelevel][$itemkey]['ag'] = 1;
-                        }
-                        
-                        if(isset($counters[$itemkey]['ag'])) {
-                            $counters[$itemkey]['ag'] += 1;
-                        } else {
-                            $counters[$itemkey]['ag'] = 1;
-                        }
-                    }
-                }
-            }
-            
-            for($i = 0; $i <= $rangesize; $i++) {
-                foreach(groups_get_all_groups($visualreport->courseid) as $group) {
-                    if(!isset($rawdata[$i][$itemkey][$group->id])) {
-                        $rawdata[$i][$itemkey][$group->id] = 0;
-                    }
-                }
-                
-                if(!isset($rawdata[$i][$itemkey]['ng'])) {
-                    $rawdata[$i][$itemkey]['ng'] = 0;
-                }
-                
-                if(!isset($rawdata[$i][$itemkey]['ag'])) {
-                    $rawdata[$i][$itemkey]['ag'] = 0;
-                }
-            }
-        }
-        
-        
-        $i = 0;
-        
-        foreach($rawdata as $gradelevel=>$items) {
-            foreach($items as $itemkey=>$groups) {
-                foreach($groups as $groupkey=>$students) {
-                    $index = $gradelevel * 10000 + $i;
-                    
-                    //$data[$index]['gradelevel'] = $gradelevel; 
-                    
-                    if($this->percent) {
-                        $data[$index]['students'] =  ($students / $counters[$itemkey][$groupkey]) * 100;
-                    } else {
-                        $data[$index]['students'] =  $students;
-                    }
-                    
-                    $data[$index]['grade'] = $gradelevel * grade_distribution::RANGE; //($gradelevel * grade_distribution::RANGE) . '% - ' . (($gradelevel + 1) * grade_distribution::RANGE - 1) . '%';
-                    
-                    $data[$index]['item'] = $visualreport->gtree->items[$itemkey]->get_name();
-                    if($groupkey == 'ng') {
-                        $data[$index]['group'] = get_string('nogroup', 'gradereport_visual');
-                    } else if($groupkey == 'ag'){
-                        $data[$index]['group'] = get_string('allgroups', 'gradereport_visual');
-                    } else {
-                        $data[$index]['group'] = groups_get_group_name($groupkey);
-                    }
-                    //$data[$index]['range'] = grade_distribution::RANGE;
-                    
-                    $i++;
-                }
-            }
-        }
-        
-       // ksort($data);
-        
-        return $data;
-    }
-}
-?>
\ No newline at end of file
diff --git a/grade/report/visual/visualizations/visual_grade_distribution_bar.php b/grade/report/visual/visualizations/visual_grade_distribution_bar.php
deleted file mode 100644
index ef94681433..0000000000
--- a/grade/report/visual/visualizations/visual_grade_distribution_bar.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php 
- ///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.org                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-require_once $CFG->dirroot . '/grade/report/visual/visualizations/visualization.php';
-
-class grade_distribution_bar extends visualization {
-    const RANGE = 10;
-    
-    public $percent = true;
-    
-    public $colorencoder;
-    
-    public $selector;
-    
-    public $itemlegend;
-
-    public function __construct() {
-        global $DB;
-    
-        parent::__construct(get_string('gradedistributionbar', 'gradereport_visual'));
-    
-        $this->layout = visualization::LAYOUT_AXIS;
-        $this->layoutsettings = null; //array('false', 'true');
-        $this->nodeshape = visualization::SHAPE_VERTICAL_BAR;
-    
-        $this->xaxis = 'grade';
-        $this->yaxis = 'students';
-        $this->xaxislabelformat = '0\\%';
-        //$this->xaxismax = 100 + grade_distribution::RANGE;
-        //$this->xaxismin = grade_distribution::RANGE;
-        $this->xaxisxoffset = -27;
-        
-        $this->xaxislabel =  get_string('grade', 'gradereport_visual');
-        
-        if($this->percent) {
-            $this->yaxislabelformat = '0\\%';
-            $this->yaxislabel =  get_string('percentstudents', 'gradereport_visual');
-        } else {
-            $this->yaxislabel =  get_string('numberstudents', 'gradereport_visual');
-        }
-        
-        $this->title = get_string('gradedistribution:title', 'gradereport_visual');
-        
-        $this->capability = 'gradereport/visual:vis:grade_distribution_bar';
-        $this->usegroups = true;
-    
-        $options = array();
-        foreach(groups_get_all_groups(required_param('id')) as $groupkey=>$group) {
-            $options[$groupkey] = grade_report_visual::truncate($group->name);
-        }
-        $options[0] = 'All Groups';
-
-// TODO: move the required_param elsewhere!!
-        if (!$course = $DB->get_record('course', array('id' => required_param('id', PARAM_INT)))) {
-            print_error('nocourseid');
-        }
-        
-        $active = groups_get_course_group($course, true);
-        
-        if (!$active) {
-            $active = 0;
-        }
-
-        $this->selector = new selector('group', $options, $active);
-        $this->selectors = array($this->selector);
-        
-        $this->colorencoder = new encoder(encoder::ENCODER_COLOR, 'item');
-        $this->encoders = array($this->colorencoder);
-    
-        $this->itemlegend = new legend($this->colorencoder, array(get_string('coursetotal', 'grades')));
-        $this->legends = array($this->itemlegend);
-    }
-    
-    public function report_data($visualreport) {
-        $data = array();
-        $data['header'] = array();
-        $data['header']['students'] = 'students';
-        $data['header']['grade'] = 'grade';
-        $data['header']['item'] = 'item';
-        
-        $rawdata = array();
-        $counters = array();
-        $rangesize = round(100 / grade_distribution::RANGE);
-
-        foreach($visualreport->grades as $itemkey=>$itemgrades) {
-            foreach($itemgrades as $studentkey=>$studentdata) {
-                if($studentdata != null && $studentdata->finalgrade != null) {
-                    $gradelevel = floor(round($studentdata->standardise_score($studentdata->finalgrade, $visualreport->gtree->items[$itemkey]->grademin, $visualreport->gtree->items[$itemkey]->grademax, 0, 100)) / grade_distribution::RANGE);
-                    //if($gradelevel == $rangesize) {
-                     //   $gradelevel = $rangesize - 1;
-                    //}
-                        
-                    if(isset($rawdata[$gradelevel][$itemkey])) {
-                        $rawdata[$gradelevel][$itemkey] += 1;
-                    } else {
-                        $rawdata[$gradelevel][$itemkey] = 1;
-                    }
-                    
-                    if(isset($counters[$itemkey])) {
-                        $counters[$itemkey] += 1;
-                    } else {
-                        $counters[$itemkey] = 1;
-                    }
-                    
-                }
-            }
-            
-            for($i = 0; $i <= $rangesize; $i++) {
-                if(!isset($rawdata[$i][$itemkey])) {
-                    $rawdata[$i][$itemkey] = 0;
-                }
-            }
-        }
-        
-        
-        $i = 0;
-        
-        foreach($rawdata as $gradelevel=>$items) {
-            foreach($items as $itemkey=>$students) {
-                $index = $gradelevel * 10000 + $i;
-                
-                if($this->percent) {
-                    $data[$index]['students'] =  ($students / $counters[$itemkey]) * 100;
-                } else {
-                    $data[$index]['students'] =  $students;
-                }
-                //$data[$index]['students'] =  $students;
-                
-                $data[$index]['grade'] = $gradelevel * grade_distribution::RANGE; //($gradelevel * grade_distribution::RANGE) . '% - ' . (($gradelevel + 1) * grade_distribution::RANGE - 1) . '%';
-                $data[$index]['item'] = $visualreport->gtree->items[$itemkey]->get_name();
-                
-                $i++;
-            }
-        }
-        
-        return $data;
-    }
-}
-?>
\ No newline at end of file
diff --git a/grade/report/visual/visualizations/visual_grade_distribution_group_bar.php b/grade/report/visual/visualizations/visual_grade_distribution_group_bar.php
deleted file mode 100644
index ed2623409e..0000000000
--- a/grade/report/visual/visualizations/visual_grade_distribution_group_bar.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php 
- ///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.org                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-require_once $CFG->dirroot . '/grade/report/visual/visualizations/visualization.php';
-
-class grade_distribution_group_bar extends visualization {
-    const RANGE = 10;
-
-    public $percent = true;
-
-    public $colorencoder;
-    
-    public $selector;
-    
-    public $grouplegend;
-
-    public function __construct() {
-        global $DB;
-    
-        parent::__construct(get_string('gradedistributiongroupbar', 'gradereport_visual'));
-    
-        $this->layout = visualization::LAYOUT_AXIS;
-        $this->layoutsettings = array('false', 'true');
-        $this->nodeshape = visualization::SHAPE_VERTICAL_BAR;
-    
-        $this->xaxis = 'grade';
-        $this->yaxis = 'students';
-        $this->xaxislabelformat = '0\\%';
-        $this->xaxisxoffset = -27;
-        
-        $this->xaxislabel =  get_string('grade', 'gradereport_visual');
-        
-        if($this->percent) {
-            $this->yaxislabelformat = '0\\%';
-            $this->yaxislabel =  get_string('percentstudents', 'gradereport_visual');
-        } else {
-            $this->yaxislabel =  get_string('numberstudents', 'gradereport_visual');
-        }
-        
-        $this->title = get_string('gradedistribution:title', 'gradereport_visual');
-        
-        $this->capability = 'gradereport/visual:vis:grade_distribution_group_bar';
-        
-        $courseid = required_param('id');
-    
-        $options = array();
-        $items = grade_item::fetch_all(array('courseid' => $courseid));
-        
-        foreach($items as $item) {
-            if(count($item->get_final()) > 0) {
-                $options[$item->id] = grade_report_visual::truncate($item->get_name());
-            }
-        }
-        $options['ai'] = 'All Items';
-        
-        $this->selector = new selector('item', $options, 'ai');
-        $this->selectors = array($this->selector);
-        
-        $this->colorencoder = new encoder(encoder::ENCODER_COLOR, 'group');
-        $this->encoders = array($this->colorencoder);
-    
-        $this->grouplegend = new legend($this->colorencoder);
-        $this->legends = array($this->grouplegend);
-    }
-    
-    private function report_rawdata($visualreport, $itemkey, &$rawdata, &$counters) {
-        $rangesize = round(100 / grade_distribution::RANGE);
-        
-        foreach($visualreport->grades[$itemkey] as $studentkey=>$studentdata) {
-                if($studentdata != null && $studentdata->finalgrade != null) {
-                    $gradelevel = floor($studentdata->standardise_score($studentdata->finalgrade, $visualreport->gtree->items[$itemkey]->grademin, $visualreport->gtree->items[$itemkey]->grademax, 0, 100) / grade_distribution::RANGE);
-                    //if($gradelevel == $rangesize) {
-                    //    $gradelevel = $rangesize - 1;
-                    //}
-                    
-                    $groups = groups_get_all_groups($visualreport->courseid, $studentkey);
-                    
-                    if(count($groups) > 0) {
-                        foreach($groups as $group) {
-                            if(isset($rawdata[$gradelevel][$group->id])) {
-                                $rawdata[$gradelevel][$group->id] += 1;
-                            } else {
-                                $rawdata[$gradelevel][$group->id] = 1;
-                            }
-                            
-                                if(isset($counters[$group->id])) {
-                                    $counters[$group->id] += 1;
-                                } else {
-                                    $counters[$group->id] = 1;
-                                }
-                            }
-                    } else {
-                            if(isset($rawdata[$gradelevel]['ng'])) {
-                                $rawdata[$gradelevel]['ng'] += 1;
-                            } else {
-                                $rawdata[$gradelevel]['ng'] = 1;
-                            }
-                            
-                            if(isset($counters['ng'])) {
-                                $counters['ng'] += 1;
-                            } else {
-                                $counters['ng'] = 1;
-                            }
-                    }
-                }
-            }
-    }
-    
-    public function report_data($visualreport) {
-        $data = array();
-        $data['header'] = array();
-        $data['header']['students'] = 'students';
-        $data['header']['grade'] = 'grade';
-        $data['header']['group'] = 'group';
-        
-        $rawdata = array();
-        $counters = array();
-        $rangesize = round(100 / grade_distribution::RANGE);
-
-        $item = optional_param('item', 'ai');
-
-        if($item == 'ai') {
-            foreach($visualreport->grades as $itemkey=>$itemgrades) {
-                $this->report_rawdata($visualreport, $itemkey, $rawdata, $counters);
-            }
-        } else {
-            $this->report_rawdata($visualreport, $item, $rawdata, $counters);
-        }
-        
-        for($i = 0; $i <= $rangesize; $i++) {
-            foreach(groups_get_all_groups($visualreport->courseid) as $group) {
-                if(!isset($rawdata[$i][$group->id])) {
-                    $rawdata[$i][$group->id] = 0;
-                }
-            }
-        }
-        
-        $i = 0;
-        
-        foreach($rawdata as $gradelevel=>$groups) {
-            foreach($groups as $groupkey=>$students) {
-                $index = $gradelevel * 10000 + $i;
-                //$data[$index]['students'] =  $students; 
-                
-                if($this->percent) {
-                    $data[$index]['students'] =  ($students / $counters[$groupkey]) * 100;
-                } else {
-                    $data[$index]['students'] =  $students;
-                }
-                
-                $data[$index]['grade'] = $gradelevel * grade_distribution::RANGE;
-                if($groupkey == 'ng') {
-                    $data[$index]['group'] = get_string('nogroup', 'gradereport_visual');
-                } else {
-                    $data[$index]['group'] = groups_get_group_name($groupkey);
-                }
-                    
-                $i++;
-            }
-        }
-        
-        return $data;
-    }
-}
-?>
\ No newline at end of file
diff --git a/grade/report/visual/visualizations/visual_grades_vs_items.php b/grade/report/visual/visualizations/visual_grades_vs_items.php
deleted file mode 100644
index 5cb8bd0747..0000000000
--- a/grade/report/visual/visualizations/visual_grades_vs_items.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php 
- ///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.org                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-require_once $CFG->dirroot . '/grade/report/visual/visualizations/visualization.php';
-
-class grades_vs_items extends visualization {
-    public $colorencodernode;
-    
-    public $colorencoderedge;
-    
-    public $shapeencodernode;
-    
-    public $shapeencoderedge;
-    
-    public $grouplegend;
-    
-    public $itemlegend;
-
-    public function __construct() {
-        parent::__construct(get_string('gradesvsitems', 'gradereport_visual'));
-        
-        $this->layout = visualization::LAYOUT_AXIS;
-        $this->layoutsettings = null;
-        
-        //$this->edges = array(new edge('item', array('group')));
-        
-        $this->xaxis = 'item';
-        $this->yaxis = 'grade';
-        $this->yaxislabelformat = '0\\%';
-        
-        $this->xaxislabel = get_string('item', 'gradereport_visual');
-        $this->yaxislabel = get_string('grade', 'gradereport_visual');
-        $this->title = get_string('gradesvsitems:title', 'gradereport_visual');
-    
-        $this->capability = 'gradereport/visual:vis:grades_vs_items';
-        
-        $this->colorencodernode = new encoder(encoder::ENCODER_COLOR, 'group');
-        $this->shapeencodernode = new encoder(encoder::ENCODER_SHAPE, 'item');
-        $this->colorencoderedge = new encoder(encoder::ENCODER_COLOR, 'group', array(2));
-        $this->encoders = array($this->colorencodernode, $this->colorencoderedge, $this->shapeencodernode);
-        
-        $this->grouplegend = new legend($this->colorencodernode);
-        $this->itemlegend = new legend($this->shapeencodernode);
-        $this->legends = array($this->grouplegend, $this->itemlegend);
-    }
-    
-    public function report_data($visualreport) {
-    $data = array();
-        $data['header'] = array();
-        $data['header']['grade'] = 'grade';
-        $data['header']['item'] = 'item';
-        $data['header']['group'] = 'group';
-        
-        $count = array();
-        
-        foreach($visualreport->grades as $itemkey=>$itemgrades) {
-            foreach($itemgrades as $studentkey=>$studentdata) {
-                if($studentdata != null && $studentdata->finalgrade != null) {
-                    foreach(groups_get_user_groups($visualreport->courseid, $studentkey) as $grouping) {
-                        
-                        if(count($grouping) > 0) {
-                            foreach($grouping as $group) {
-                                if(!isset($data[$itemkey . '-' . $group])) {
-                                    $data[$itemkey . '-' . $group] = array();
-                                    $data[$itemkey . '-' . $group]['grade'] = $studentdata->standardise_score($studentdata->finalgrade, $visualreport->gtree->items[$itemkey]->grademin, $visualreport->gtree->items[$itemkey]->grademax, 0, 100);
-                                    $data[$itemkey . '-' . $group]['item'] = $visualreport->gtree->items[$itemkey]->get_name();
-                                    $data[$itemkey . '-' . $group]['group'] = groups_get_group_name($group);
-                                    $count[$itemkey . '-' . $group] = 1;
-                                } else {
-                                    $data[$itemkey . '-' . $group]['grade'] += $studentdata->standardise_score($studentdata->finalgrade, $visualreport->gtree->items[$itemkey]->grademin, $visualreport->gtree->items[$itemkey]->grademax, 0, 100);
-                                    $count[$itemkey . '-' . $group]++;
-                                }
-                            }
-                        } else {
-                            if(!isset($data[$itemkey . '-ng'])) {
-                                $data[$itemkey . '-ng'] = array();
-                                $data[$itemkey . '-ng']['grade'] = $studentdata->standardise_score($studentdata->finalgrade, $visualreport->gtree->items[$itemkey]->grademin, $visualreport->gtree->items[$itemkey]->grademax, 0, 100);
-                                $data[$itemkey . '-ng']['item'] = $visualreport->gtree->items[$itemkey]->get_name();
-                                $data[$itemkey . '-ng']['group'] = get_string('nogroup', 'gradereport_visual');
-                                $count[$itemkey . '-ng'] = 1;
-                            } else {
-                                $data[$itemkey . '-ng']['grade'] += $studentdata->standardise_score($studentdata->finalgrade, $visualreport->gtree->items[$itemkey]->grademin, $visualreport->gtree->items[$itemkey]->grademax, 0, 100);
-                                $count[$itemkey . '-ng']++;
-                            }
-                        }
-                        
-                         if(!isset($data[$itemkey . '-ag'])) {
-                            $data[$itemkey . '-ag'] = array();
-                            $data[$itemkey . '-ag']['grade'] = $studentdata->standardise_score($studentdata->finalgrade, $visualreport->gtree->items[$itemkey]->grademin, $visualreport->gtree->items[$itemkey]->grademax, 0, 100);
-                            $data[$itemkey . '-ag']['item'] = $visualreport->gtree->items[$itemkey]->get_name();
-                            $data[$itemkey . '-ag']['group'] = get_string('allgroups', 'gradereport_visual');
-                            $count[$itemkey . '-ag'] = 1;
-                        } else {
-                            $data[$itemkey . '-ag']['grade'] += $studentdata->standardise_score($studentdata->finalgrade, $visualreport->gtree->items[$itemkey]->grademin, $visualreport->gtree->items[$itemkey]->grademax, 0, 100);
-                            $count[$itemkey . '-ag']++;
-                        }
-                        
-                    }
-                }
-            }
-        }
-        
-        foreach($data as $key=>$row) {
-            if($key != 'header'){
-                $data[$key]['grade'] /= $count[$key];
-            }
-        }
-        
-        return $data;
-    }
-}
-?>
\ No newline at end of file
diff --git a/grade/report/visual/visualizations/visual_grades_vs_students.php b/grade/report/visual/visualizations/visual_grades_vs_students.php
deleted file mode 100644
index cc5d165b5b..0000000000
--- a/grade/report/visual/visualizations/visual_grades_vs_students.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
- ///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.org                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-require_once $CFG->dirroot . '/grade/report/visual/visualizations/visualization.php';
-
-class grades_vs_students extends visualization {
-
-    public $colorencoder;
-    
-    public $shapeencoder;
-    
-    public $grouplegend;
-    
-    public $itemlegend;
-    
-
-    public function __construct() {
-        parent::__construct(get_string('gradesvsstudents', 'gradereport_visual'));
-        
-        $this->layout = visualization::LAYOUT_AXIS;
-        $this->layoutsettings = null;
-        
-        $this->xaxis = 'student';
-        $this->yaxis = 'grade';
-        
-        $this->xaxislabel = get_string('student', 'gradereport_visual');
-        $this->yaxislabel = get_string('grade', 'gradereport_visual');
-        $this->title = get_string('gradesvsstudents:title', 'gradereport_visual');
-        
-        $this->capability = 'gradereport/visual:vis:grades_vs_students';
-        
-        $this->colorencoder = new encoder(encoder::ENCODER_COLOR, 'item');
-        $this->shapeencoder = new encoder(encoder::ENCODER_SHAPE, 'group');
-        $this->encoders = array($this->colorencoder, $this->shapeencoder);
-    
-        $this->grouplegend = new legend($this->shapeencoder);
-        $this->itemlegend = new legend($this->colorencoder);
-        $this->legends = array($this->itemlegend, $this->grouplegend);
-    }
-    
-    
-    public function report_data($visualreport) {
-        $data = array();
-        $data['header'] = array();
-        $data['header']['student'] = 'student';
-        $data['header']['grade'] = 'grade';
-        $data['header']['item'] = 'item';
-        $data['header']['group'] = 'group';
-        
-        foreach($visualreport->grades as $itemkey=>$itemgrades) {
-            foreach($itemgrades as $studentkey=>$studentdata) {
-                if($studentdata != null && $studentdata->finalgrade != null) {
-                    foreach(groups_get_user_groups($visualreport->courseid, $studentkey) as $grouping) {
-                        if(count($grouping) > 0) {
-                            foreach($grouping as $group) {
-                                $data[$studentkey . '-' . $itemkey . '-' . $group]['student'] = $visualreport->users[$studentkey]->firstname . ' ' . $visualreport->users[$studentkey]->lastname;
-                                $data[$studentkey . '-' . $itemkey . '-' . $group]['grade'] = $studentdata->standardise_score($studentdata->finalgrade, $visualreport->gtree->items[$itemkey]->grademin, $visualreport->gtree->items[$itemkey]->grademax, 0, 100); 
-                                $data[$studentkey . '-' . $itemkey . '-' . $group]['item'] = $visualreport->gtree->items[$itemkey]->get_name();
-                                $data[$studentkey . '-' . $itemkey . '-' . $group]['group'] = groups_get_group_name($group);
-                            }
-                        } else {
-                            $data[$studentkey . '-' . $itemkey . '-ng' ]['student'] = $visualreport->users[$studentkey]->firstname . ' ' . $visualreport->users[$studentkey]->lastname;
-                            $data[$studentkey . '-' . $itemkey . '-ng' ]['grade'] = $studentdata->standardise_score($studentdata->finalgrade, $visualreport->gtree->items[$itemkey]->grademin, $visualreport->gtree->items[$itemkey]->grademax, 0, 100); 
-                            $data[$studentkey . '-' . $itemkey . '-ng' ]['item'] = $visualreport->gtree->items[$itemkey]->get_name();
-                            $data[$studentkey . '-' . $itemkey . '-ng' ]['group'] = get_string('nogroup', 'gradereport_visual');
-                        }
-                    }
-                }
-            }
-        }
-        
-        return $data;
-    }
-}
-
-?>
diff --git a/grade/report/visual/visualizations/visualization.php b/grade/report/visual/visualizations/visualization.php
deleted file mode 100644
index 7194d81c82..0000000000
--- a/grade/report/visual/visualizations/visualization.php
+++ /dev/null
@@ -1,476 +0,0 @@
-<?php
- ///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.org                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-/**
- * File witch defines the abstract class visualization witch all visualizations must extend.
- * Also defines serveral classes used by the visualization class and classes that extend it.
- * @package gradebook
- */
-
-/**
- * Selector class that represents the selector UI widget in the flash/flex front end.
- * @package gradebook
- */
-class selector {
-    public $param;
-    public $options;
-    public $active;
-    
-    /**
-     * Selector constructer.
-     * @param string $param the URI value that the selector will add to the URL from witch the data for the visualization is loaded.
-     * @param array $options an array of options (strings) that the selector will show where the key is the value of $param to be added to the URL.
-     * @param string $active the key of the active element in $options that will show up as selected by defualt in the UI widget.
-     */
-    public function __construct($param, array $options, $active = null) {
-        $this->param = $param;
-        $this->options = $options;
-        $this->active = $active;
-    }
-}
-
-/**
- * Edge class that represents a set of edges that will be created based on the data
- * recvied by the front end.
- * @package gradebook
- */
-class edge {
-    public $sortby;
-    public $groupby;
-    
-    /**
-     * Edge constructer.
-     * @param array $sortby array of data feilds the nodes should be sorted by whell creating the edges.
-     * @param array $groupby array of data feilds the nodes will be grouped by when creating the edges.
-     */
-    public function __construct($sortby = null, $groupby = null) {
-        $this->sortby = $sortby;
-        $this->groupby = $groupby;
-    }
-}
-
-/**
- * Encoder class that represents an encoder that will be applied to the visualization.
- * @package gradebook
- */
-class encoder {
-    const ENCODER_DEFUALT = 1;
-    const ENCODER_COLOR = 1;
-    const ENCODER_SHAPE = 2; 
-    const ENCODER_SIZE = 3;
-    
-    /// Each encoder class needs to have a unique int id so it can be
-    /// paird with a legend class. $counter holds the last id used in a
-    /// encoder class + 1, so the next encoder class will have an $id of
-    /// $counter.
-    private static $counter = 0;
-    
-    public $id;
-    public $type;
-    public $settings;
-    public $datafield;
-    
-    /**
-     * Encoder constructer.
-     * @param int $type the encoder type, one of ENCODER_COLOR, ENCODER_SHAPE or ENCODER_SIZE.
-     * @param string $datafield the datafield of the data the encoder will effect.
-     * @param array $settings the settings that will be passed to the encoder constructer in flare (in the front end).
-     */
-    public function __construct($type, $datafield, array $settings = null) {
-        $this->type = $type;
-        $this->settings = $settings;
-        $this->datafield = $datafield;
-        $this->id = self::$counter++;
-    }
-}
-
-/**
- * Legend class representing a legend in the visualization.
- * Each legend is based on an encoder.
- * @package gradebook
- */
-class legend {
-    public $encoder;
-    
-    public $show;
-    
-    /**
-     * Legend constructer.
-     * @param object $encoder the encoder this legend is based on.
-     * @param string $show the value to be selected by defualt in the legend, if null all are selected.
-     */
-    public function __construct($encoder, $show = null) {
-        $this->encoder = $encoder;
-        $this->show = $show;
-    }
-}
-
-/**
- * Abstract visualization class that all visualization deftions (classes) must extend.
- * @package gradebook 
- */
-abstract class visualization {
-    /// Layout types.
-    /// Currently only LAYOUT_AXIS has been fully implmented and tested,
-    /// others may have unexpected results or errors in the front end.
-    /// TODO: Add support for and test all layout types.
-    const LAYOUT_DEFAULT = 1;
-    const LAYOUT_AXIS = 1;
-    const LAYOUT_CIRCLE = 2;
-    const LAYOUT_DENDROGRAM = 3;
-    const LAYOUT_FORCEDIRECTED = 4;
-    const LAYOUT_INDENTEDTREE = 5;
-    const LAYOUT_NODELINKTREE = 6;
-    const LAYOUT_PIE = 7;
-    const LAYOUT_RADIALTREE = 8;
-    const LAYOUT_RANDOM = 9;
-    const LAYOUT_STACKEDAREA = 10;
-    const LAYOUT_TREEMAP = 11;
-    
-    /// Shape types for edges and nodes.
-    /// Currently only SHAPE_HORIZONTAL_BAR, SHAPE_VERTICAL_BAR,
-    /// and SHAPE_CARDINAL have been fully tested, others may have
-    /// unexpected results or errors in the front end.
-    /// SHAPE_HORIZONTAL_BAR will trun into SHAPE_VERTICAL_BAR when 
-    /// inverted and vice versa.
-    /// TODO: Test and add support for all shapes.
-    const SHAPE_BEZIER = 1;
-    const SHAPE_BLOCK = -1;
-    const SHAPE_CARDINAL = 2;
-    const SHAPE_HORIZONTAL_BAR = -5;
-    const SHAPE_LINE = 0;
-    const SHAPE_POLYBLOB = -3;
-    const SHAPE_POLYGON = -2;
-    const SHAPE_VERTICAL_BAR = -4;
-    const SHAPE_WEDGE = -6;
-    
-    /**
-     * Visualization name, name displayed in visualization selector and other places.
-     * @var string $name
-     */
-    public $name;
-    
-    /**
-     * The layout type to be used in the visualization. Must be one of the LAYOUT_* constants.
-     * @var int $layout
-     */
-    public $layout = self::LAYOUT_DEFAULT;
-   
-    /**
-     * Array of settings to be past to the layout constructor in the front end.
-     * Thess will be diffrent for each layout type.
-     * @var array $layoutsettings
-     */
-    public $layoutsettings = null;
-   
-    /**
-     * If true the data past to the front end will be filiterd by the currently 
-     * selected group in moodle.
-     * @var bool $usegroups
-     */
-    public $usegroups = false;
-   
-    /**
-     * Array of edge objects that will be used to create the edges in the 
-     * visualization.
-     * @var array $edges
-     */
-    public $edges = null;
-   
-    /**
-     * The shape to be used for the nodes in the visualization. 
-     * Must be one of the SHAPE_* constants.
-     * @var int $nodeshape
-     */
-    public $nodeshape = null;
-   
-    /**
-     * The edge shape to be used for the edges in the visualization.
-     * Must be one of the SHAPE_* constants.
-     * @var int $edgeshape
-     */
-    public $edgeshape = null;
-    
-    /**
-     * Array of selector objects that repersent sellector UI widgets
-     * in the flash front end.
-     * @var array $selectors
-     */
-    public $selectors = null;
-    
-    /**
-     * Font to be used threw out the visualization.
-     * @var string $font
-     */
-    public $font = 'monospace';
-    
-    /**
-     * Size of the font to be used in the visualization.
-     * @var int $fontsize
-     */
-    public $fontsize = 20;
-    
-    /**
-     * Array of legend objects that repersent the legends that will
-     * be shown in the visualization.
-     * @var array $legends
-     */
-    public $legends = null;
-
-    /**
-     * Data feild for the xaxis if using axis layout type.
-     * @var string $xaxis
-     */
-    public $xaxis;
-    
-    /**
-     * Data feild for the yaxis if using axis layout type.
-     * @var string $yaxis
-     */
-    public $yaxis;
-    
-    /**
-     * The format to use to encode the xaxis labels.
-     * @var string $xaxislabelformat
-     */
-    public $xaxislabelformat;
-    
-    /**
-     * The format to use to encode the yaxis labels.
-     * @var string $yaxislabelformat
-     */
-    public $yaxislabelformat;
-    
-    /**
-     * The minium value of the x axis.
-     * @var float $xaxismin
-     */
-    public $xaxismin;
-    
-    /**
-     * The maxium value of the x axis.
-     * @var float $xaxismax
-     */
-    public $xaxismax;
-    
-    /**
-     * The minium value of the y axis.
-     * @var float $yaxismin
-     */
-    public $yaxismin;
-    
-    /**
-     * The maxium value of the y axis.
-     * @var float $yaxismax
-     */
-    public $yaxismax;
-    
-    /**
-     * The x axis title.
-     * @var string $xaxislabel
-     */
-    public $xaxislabel;
-    
-    /**
-     * The y axis title.
-     * @var string $yaxislabel 
-     */
-    public $yaxislabel;
-    
-    /**
-     * The offset in pixels the y axis labels will be moved in the y direction
-     * @var float $yaxisyoffset 
-     */
-    public $yaxisyoffset;
-    
-    /**
-     * The offset in pixels the y axis labels will be moved in the x direction
-     * @var float $yaxisxoffset 
-     */
-    public $yaxisxoffset;
-    
-    /**
-     * The offset in pixels the x axis labels will be moved in the y direction
-     * @var float $xaxisyoffset 
-     */
-    public $xaxisyoffset;
-    
-    /**
-     * The offset in pixels the x axis labels will be moved in the x direction
-     * @var float $xaxisxoffset 
-     */
-    public $xaxisxoffset;
-    
-    /**
-    * The title that will be show in the visualization.
-    * @var string $title
-    */
-    public $title;
-    
-    /**
-     * The capability required of the user to view this visualization.
-     * If null, no capability is needed.
-     * @var string $capability
-     */
-    public $capability = null;
-    
-    /**
-     * Array of encoders to apply to the visualization.
-     * @var array $encoders
-     */
-    public $encoders = null;
-    
-    /**
-     * Background color of the visualization.
-     * @var string $backgroundcolor
-     */
-    public $backgroundcolor = 'ffffff';
-    
-    /**
-     * Width of the embedded flash applet.
-     * @var int $width
-     */
-    public $width = 800;
-    
-    /**
-     * Width of the embedded flash applet.
-     * @var int $height
-     */
-    public $height = 600;
-    
-    /**
-     * Frame rate of the flash applet.
-     * @var int $framerate
-     */
-    public $framerate = 30;
-    
-    /**
-     * Default quality setting for the flash applet.
-     * @var string $quality
-     */
-    public $quality = "high";
-
-    /**
-     * Background color of the pop up widget.
-     * @var string $popupbgcolor 
-     */
-    public $popupbgcolor = '7777ff';
-
-    /**
-     * Background alpha value of the pop up widget.
-     * @var float $popupbgalpha
-     */
-    public $popupbgalpha = 0.60;
-    
-    /**
-     * Color of the border of the pop up widget.
-     * @var string $popuplinecolor
-     */
-    public $popuplinecolor = '0000ff';
-    
-    /**
-     * Alpha value of the border of the pop up widget
-     * @var float $popuplinealpha
-     */
-    public $popuplinealpha = 0.3;
-    
-    /**
-     * Line width of the border of the pop up widget
-     * @var int $popuplinesize
-     */
-    public $popuplinesize = 3;
-    
-    /**
-     * Font to be used in the pop up widget
-     * @var string $popupfont
-     */
-    public $popupfont = 'monospace';
-    
-    /**
-     * Font size used in the pop up widget
-     * @var int $popupfontsize
-     */
-    public $popupfontsize = 12;
-
-    /**
-     * Background color of the button widget
-     * @var string buttonbgcolor
-     */
-    public $buttonbgcolor = '9999FF';
-    
-    /**
-     * Background alpha value of the button widget.
-     * @var float $buttonbgalpha 
-     */
-    public $buttonbgalpha = 0.6;
-    
-    /**
-     * Font used on button widgets.
-     * @var string $buttonfont
-     */
-    public $buttonfont = 'monospace';
-    
-    /**
-     * Font size used on button widgets.
-     * @var int $buttonfontsize
-     */
-    public $buttonfontsize = 12;
-    
-    /**
-     * Line width of the border of the button widget.
-     * @var int $buttonlinesize
-     */
-    public $buttonlinesize = 1;
-    
-    /**
-     * Color of the border of the button widget.
-     *@var string $buttonlinecolor
-     */
-    public $buttonlinecolor = '4444FF';
-    
-    /**
-     * Alpha value of the border for the button widget.
-     * @var flaot $buttonlinealpha
-     */
-    public $buttonlinealpha = 0.3;
-
-    /**
-     * Visualization constructer.
-     * Sets name of visualization.
-     * @param string $name The name of the visualization.
-     */
-    public function __construct($name) {
-        $this->name = $name;
-    }
-    
-    /**
-     * Report_data function that will be called to generate the
-     * data sent to the front end. All visualization deftions must
-     * implment this function.
-     * @param object $visualreport The visual report object.
-     * @returns array Returns an 2d array repersenting a table of data to be sent to the front end.
-     */
-    abstract public function report_data($visualreport);
-}
-?>
\ No newline at end of file