diff --git a/libraries/chart/ofc/README.txt b/libraries/chart/ofc/README.txt
deleted file mode 100644
index 012fbfd52..000000000
--- a/libraries/chart/ofc/README.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Open Flash Chart - PHP libraries. These help create data files for Open Flash Chart.
-Copyright (C) 2007 
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library 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
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
\ No newline at end of file
diff --git a/libraries/chart/ofc/dot_base.php b/libraries/chart/ofc/dot_base.php
deleted file mode 100644
index 5772efcd9..000000000
--- a/libraries/chart/ofc/dot_base.php
+++ /dev/null
@@ -1,231 +0,0 @@
-<?php
-
-/**
- * A private class. All the other line-dots inherit from this.
- * Gives them all some common methods.
- */ 
-class dot_base
-{
-	/**
-	 * @param $type string
-	 * @param $value integer
-	 */
-	function dot_base($type, $value=null)
-	{
-		$this->type = $type;
-		if( isset( $value ) )
-			$this->value( $value );
-	}
-	
-	/**
-	 * For line charts that only require a Y position
-	 * for each point.
-	 * @param $value as integer, the Y position
-	 */
-	function value( $value )
-	{
-		$this->value = $value;
-	}
-	
-	/**
-	 * For scatter charts that require an X and Y position for
-	 * each point.
-	 * 
-	 * @param $x as integer
-	 * @param $y as integer
-	 */
-	function position( $x, $y )
-	{
-		$this->x = $x;
-		$this->y = $y;
-	}
-	
-	/**
-	 * @param $colour is a string, HEX colour, e.g. '#FF0000' red
-	 */
-	function colour($colour)
-	{
-		$this->colour = $colour;
-		return $this;
-	}
-	
-	/**
-	 * The tooltip for this dot.
-	 */
-	function tooltip( $tip )
-	{
-		$this->tip = $tip;
-		return $this;
-	}
-	
-	/**
-	 * @param $size is an integer. Size of the dot.
-	 */
-	function size($size)
-	{
-		$tmp = 'dot-size';
-		$this->$tmp = $size;
-		return $this;
-	}
-	
-	/**
-	 * a private method
-	 */
-	function type( $type )
-	{
-		$this->type = $type;
-		return $this;
-	}
-	
-	/**
-	 * @param $size is an integer. The size of the hollow 'halo' around the dot that masks the line.
-	 */
-	function halo_size( $size )
-	{
-		$tmp = 'halo-size';
-		$this->$tmp = $size;
-		return $this;
-	}
-	
-	/**
-	 * @param $do as string. One of three options (examples):
-	 *  - "http://example.com" - browse to this URL
-	 *  - "https://example.com" - browse to this URL
-	 *  - "trace:message" - print this message in the FlashDevelop debug pane
-	 *  - all other strings will be called as Javascript functions, so a string "hello_world"
-	 *  will call the JS function "hello_world(index)". It passes in the index of the
-	 *  point.
-	 */
-	function on_click( $do )
-	{
-		$tmp = 'on-click';
-		$this->$tmp = $do;
-	}
-}
-
-/**
- * Draw a hollow dot
- */
-class hollow_dot extends dot_base
-{	
-	function hollow_dot($value=null)
-	{
-		parent::dot_base( 'hollow-dot', $value );
-	}
-}
-
-/**
- * Draw a star
- */
-class star extends dot_base
-{
-	/**
-	 * The constructor, takes an optional $value
-	 */
-	function star($value=null)
-	{
-		parent::dot_base( 'star', $value );
-	}
-	
-	/**
-	 * @param $angle is an integer.
-	 */
-	function rotation($angle)
-	{
-		$this->rotation = $angle;
-		return $this;
-	}
-	
-	/**
-	 * @param $is_hollow is a boolean.
-	 */
-	function hollow($is_hollow)
-	{
-		$this->hollow = $is_hollow;
-	}
-}
-
-/**
- * Draw a 'bow tie' shape.
- */
-class bow extends dot_base
-{
-	/**
-	 * The constructor, takes an optional $value
-	 */
-	function bow($value=null)
-	{
-		parent::dot_base( 'bow', $value );
-	}
-	
-	/**
-	 * Rotate the anchor object.
-	 * @param $angle is an integer.
-	 */
-	function rotation($angle)
-	{
-		$this->rotation = $angle;
-		return $this;
-	}
-}
-
-/**
- * An <i><b>n</b></i> sided shape.
- */
-class anchor extends dot_base
-{
-	/**
-	 * The constructor, takes an optional $value
-	 */
-	function anchor($value=null)
-	{
-		parent::dot_base( 'anchor', $value );
-	}
-	
-	/**
-	 * Rotate the anchor object.
-	 * @param $angle is an integer.
-	 */
-	function rotation($angle)
-	{
-		$this->rotation = $angle;
-		return $this;
-	}
-	
-	/**
-	 * @param $sides is an integer. Number of sides this shape has.
-	 */
-	function sides($sides)
-	{
-		$this->sides = $sides;
-		return $this;
-	}
-}
-
-/**
- * A simple dot
- */
-class dot extends dot_base
-{
-	/**
-	 * The constructor, takes an optional $value
-	 */
-	function dot($value=null)
-	{
-		parent::dot_base( 'dot', $value );
-	}
-}
-
-/**
- * A simple dot
- */
-class solid_dot extends dot_base
-{
-	/**
-	 * The constructor, takes an optional $value
-	 */
-	function solid_dot($value=null)
-	{
-		parent::dot_base( 'solid-dot', $value );
-	}
-}
\ No newline at end of file
diff --git a/libraries/chart/ofc/json_format.php b/libraries/chart/ofc/json_format.php
deleted file mode 100644
index b8e3de5cb..000000000
--- a/libraries/chart/ofc/json_format.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-// Pretty print some JSON
-function json_format($json)
-{
-    $tab = "  ";
-    $new_json = "";
-    $indent_level = 0;
-    $in_string = false;
-
-/*
- commented out by monk.e.boy 22nd May '08
- because my web server is PHP4, and
- json_* are PHP5 functions...
-
-    $json_obj = json_decode($json);
-
-    if($json_obj === false)
-        return false;
-
-    $json = json_encode($json_obj);
-*/
-    $len = strlen($json);
-
-    for($c = 0; $c < $len; $c++)
-    {
-        $char = $json[$c];
-        switch($char)
-        {
-            case '{':
-            case '[':
-                if(!$in_string)
-                {
-                    $new_json .= $char . "\n" . str_repeat($tab, $indent_level+1);
-                    $indent_level++;
-                }
-                else
-                {
-                    $new_json .= $char;
-                }
-                break;
-            case '}':
-            case ']':
-                if(!$in_string)
-                {
-                    $indent_level--;
-                    $new_json .= "\n" . str_repeat($tab, $indent_level) . $char;
-                }
-                else
-                {
-                    $new_json .= $char;
-                }
-                break;
-            case ',':
-                if(!$in_string)
-                {
-                    $new_json .= ",\n" . str_repeat($tab, $indent_level);
-                }
-                else
-                {
-                    $new_json .= $char;
-                }
-                break;
-            case ':':
-                if(!$in_string)
-                {
-                    $new_json .= ": ";
-                }
-                else
-                {
-                    $new_json .= $char;
-                }
-                break;
-            case '"':
-                if($c > 0 && $json[$c-1] != '\\')
-                {
-                    $in_string = !$in_string;
-                }
-            default:
-                $new_json .= $char;
-                break;                   
-        }
-    }
-
-    return $new_json;
-}
\ No newline at end of file
diff --git a/libraries/chart/ofc/ofc_area_base.php b/libraries/chart/ofc/ofc_area_base.php
deleted file mode 100644
index a6e811fd5..000000000
--- a/libraries/chart/ofc/ofc_area_base.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * inherits from line
- */
-class area extends line
-{
-	function area()
-	{
-		$this->type      = "area";
-	}
-	
-	/**
-	 * the fill colour
-	 */
-	function set_fill_colour( $colour )
-	{
-		$this->fill = $colour;
-	}
-	
-	/**
-	 * sugar: see set_fill_colour
-	 */
-	function fill_colour( $colour )
-	{
-		$this->set_fill_colour( $colour );
-		return $this;
-	}
-	
-	function set_fill_alpha( $alpha )
-	{
-		$tmp = "fill-alpha";
-		$this->$tmp = $alpha;
-	}
-	
-	function set_loop()
-	{
-		$this->loop = true;
-	}
-}
diff --git a/libraries/chart/ofc/ofc_area_hollow.php b/libraries/chart/ofc/ofc_area_hollow.php
deleted file mode 100644
index 4293af0b6..000000000
--- a/libraries/chart/ofc/ofc_area_hollow.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-class area_hollow extends area_base
-{
-	function area_hollow()
-	{
-		$this->type      = "area_hollow";
-		parent::area_base();
-	}
-}
diff --git a/libraries/chart/ofc/ofc_area_line.php b/libraries/chart/ofc/ofc_area_line.php
deleted file mode 100644
index 5731391a3..000000000
--- a/libraries/chart/ofc/ofc_area_line.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-class area_line extends area_base
-{
-	function area_line()
-	{
-		$this->type      = "area_line";
-		parent::area_base();
-	}
-}
diff --git a/libraries/chart/ofc/ofc_arrow.php b/libraries/chart/ofc/ofc_arrow.php
deleted file mode 100644
index 3c2c6e9dc..000000000
--- a/libraries/chart/ofc/ofc_arrow.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-class ofc_arrow
-{
-	/**
-	 *@param $x as number. Start x position
-	 *@param $y as number. Start y position
-	 *@param $a as number. End x position
-	 *@param $b as number. End y position
-	 *@param $colour as string.
-	 *@param $barb_length as number. Length of the barbs in pixels.
-	 */
-	function ofc_arrow($x, $y, $a, $b, $colour, $barb_length=10)
-	{
-		$this->type     = "arrow";
-		$this->start	= array("x"=>$x, "y"=>$y);
-		$this->end		= array("x"=>$a, "y"=>$b);
-		$this->colour($colour);
-		$this->{"barb-length"} = $barb_length;
-	}
-	
-	function colour( $colour )
-	{
-		$this->colour = $colour;
-		return $this;
-	}
-}
diff --git a/libraries/chart/ofc/ofc_bar.php b/libraries/chart/ofc/ofc_bar.php
deleted file mode 100644
index 6ddda4274..000000000
--- a/libraries/chart/ofc/ofc_bar.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-include_once 'ofc_bar_base.php';
-
-class bar_value
-{
-	function bar_value( $top, $bottom=null )
-	{
-		$this->top = $top;
-		
-		if( isset( $bottom ) )
-			$this->bottom = $bottom;
-	}
-	
-	function set_colour( $colour )
-	{
-		$this->colour = $colour;
-	}
-	
-	function set_tooltip( $tip )
-	{
-		$this->tip = $tip;
-	}
-}
-
-class bar extends bar_base
-{
-	function bar()
-	{
-		$this->type      = "bar";
-		parent::bar_base();
-	}
-}
-
diff --git a/libraries/chart/ofc/ofc_bar_3d.php b/libraries/chart/ofc/ofc_bar_3d.php
deleted file mode 100644
index 47552184c..000000000
--- a/libraries/chart/ofc/ofc_bar_3d.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-include_once 'ofc_bar_base.php';
-
-class bar_3d_value
-{
-	function bar_3d_value( $top )
-	{
-		$this->top = $top;
-	}
-	
-	function set_colour( $colour )
-	{
-		$this->colour = $colour;
-	}
-	
-	function set_tooltip( $tip )
-	{
-		$this->tip = $tip;
-	}
-}
-
diff --git a/libraries/chart/ofc/ofc_bar_base.php b/libraries/chart/ofc/ofc_bar_base.php
deleted file mode 100644
index c1303b86b..000000000
--- a/libraries/chart/ofc/ofc_bar_base.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-
-/* this is a base class */
-
-class bar_base
-{
-	function bar_base(){}
-
-	/**
-	 * @param $text as string the key text
-	 * @param $size as integer, size in pixels
-	 */
-	function set_key( $text, $size )
-	{
-		$this->text = $text;
-		$tmp = 'font-size';
-		$this->$tmp = $size;
-	}
-	
-	/**
-	 * syntatical sugar.
-	 */
-	function key( $text, $size )
-	{
-		$this->set_key( $text, $size );
-	}
-
-	/**
-	 * @param $v as an array, a mix of:
-	 * 	- a bar_value class. You can use this to customise the paramters of each bar.
-	 * 	- integer. This is the Y position of the top of the bar.
-	 */
-	function set_values( $v )
-	{
-		$this->values = $v;		
-	}
-	
-	/**
-	 * see set_values
-	 */
-	function append_value( $v )
-	{
-		$this->values[] = $v;		
-	}
-	
-	/**
-	 * @param $colour as string, a HEX colour, e.g. '#ff0000' red
-	 */
-	function set_colour( $colour )
-	{
-		$this->colour = $colour;	
-	}
-	
-	/**
-	 *syntatical sugar
-	 */
-	function colour( $colour )
-	{
-		$this->set_colour( $colour );
-	}
-
-	/**
-	 * @param $alpha as real number (range 0 to 1), e.g. 0.5 is half transparent
-	 */
-	function set_alpha( $alpha )
-	{
-		$this->alpha = $alpha;	
-	}
-	
-	/**
-	 * @param $tip as string, the tip to show. May contain various magic variables.
-	 */
-	function set_tooltip( $tip )
-	{
-		$this->tip = $tip;	
-	}
-	
-	/**
-	 *@param $on_show as line_on_show object
-	 */
-	function set_on_show($on_show)
-	{
-		$this->{'on-show'} = $on_show;
-	}
-	
-	function set_on_click( $text )
-	{
-		$tmp = 'on-click';
-		$this->$tmp = $text;
-	}
-	
-	function attach_to_right_y_axis()
-	{
-		$this->axis = 'right';
-	}
-}
-
diff --git a/libraries/chart/ofc/ofc_bar_filled.php b/libraries/chart/ofc/ofc_bar_filled.php
deleted file mode 100644
index 837c1fc45..000000000
--- a/libraries/chart/ofc/ofc_bar_filled.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-include_once 'ofc_bar_base.php';
-
-class bar_filled_value extends bar_value
-{
-	function bar_filled_value( $top, $bottom=null )
-	{
-		parent::bar_value( $top, $bottom );	
-	}
-	
-	function set_outline_colour( $outline_colour )
-	{
-		$tmp = 'outline-colour';
-		$this->$tmp = $outline_colour;	
-	}
-}
-
-class bar_filled extends bar_base
-{
-	function bar_filled( $colour=null, $outline_colour=null )
-	{
-		$this->type      = "bar_filled";
-		parent::bar_base();
-		
-		if( isset( $colour ) )
-			$this->set_colour( $colour );
-		
-		if( isset( $outline_colour ) )
-			$this->set_outline_colour( $outline_colour );
-	}
-	
-	function set_outline_colour( $outline_colour )
-	{
-		$tmp = 'outline-colour';
-		$this->$tmp = $outline_colour;	
-	}
-}
-
diff --git a/libraries/chart/ofc/ofc_bar_glass.php b/libraries/chart/ofc/ofc_bar_glass.php
deleted file mode 100644
index e83350151..000000000
--- a/libraries/chart/ofc/ofc_bar_glass.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-
-include_once 'ofc_bar_base.php';
-
-class bar_on_show
-{
-	/**
-	 *@param $type as string. Can be any one of:
-	 * - 'pop-up'
-	 * - 'drop'
-	 * - 'fade-in'
-	 * - 'grow-up'
-	 * - 'grow-down'
-	 * - 'pop'
-	 *
-	 * @param $cascade as float. Cascade in seconds
-	 * @param $delay as float. Delay before animation starts in seconds.
-	 */
-	function __construct($type, $cascade, $delay)
-	{
-		$this->type = $type;
-		$this->cascade = (float)$cascade;
-		$this->delay = (float)$delay;
-	}
-}
-
-class bar_value
-{
-	/**
-	 * @param $top as integer. The Y value of the top of the bar
-	 * @param OPTIONAL $bottom as integer. The Y value of the bottom of the bar, defaults to Y min.
-	 */
-	function bar_value( $top, $bottom=null )
-	{
-		$this->top = $top;
-		
-		if( isset( $bottom ) )
-			$this->bottom = $bottom;
-	}
-	
-	function set_colour( $colour )
-	{
-		$this->colour = $colour;
-	}
-	
-	function set_tooltip( $tip )
-	{
-		$this->tip = $tip;
-	}
-}
-
-class bar extends bar_base
-{
-	function bar()
-	{
-		$this->type      = "bar";
-		parent::bar_base();
-	}
-}
-
-class bar_glass extends bar_base
-{
-	function bar_glass()
-	{
-		$this->type      = "bar_glass";
-		parent::bar_base();
-	}
-}
-
-class bar_cylinder extends bar_base
-{
-	function bar_cylinder()
-	{
-		$this->type      = "bar_cylinder";
-		parent::bar_base();
-	}
-}
-
-class bar_cylinder_outline extends bar_base
-{
-	function bar_cylinder_outline()
-	{
-		$this->type      = "bar_cylinder_outline";
-		parent::bar_base();
-	}
-}
-
-class bar_rounded_glass extends bar_base
-{
-	function bar_rounded_glass()
-	{
-		$this->type      = "bar_round_glass";
-		parent::bar_base();
-	}
-}
-
-class bar_round extends bar_base
-{
-	function bar_round()
-	{
-		$this->type      = "bar_round";
-		parent::bar_base();
-	}
-}
-
-class bar_dome extends bar_base
-{
-	function bar_dome()
-	{
-		$this->type      = "bar_dome";
-		parent::bar_base();
-	}
-}
-
-class bar_round3d extends bar_base
-{
-	function bar_round3d()
-	{
-		$this->type      = "bar_round3d";
-		parent::bar_base();
-	}
-}
-
-class bar_3d extends bar_base
-{
-	function bar_3d()
-	{
-		$this->type      = "bar_3d";
-		parent::bar_base();
-	}
-}
\ No newline at end of file
diff --git a/libraries/chart/ofc/ofc_bar_sketch.php b/libraries/chart/ofc/ofc_bar_sketch.php
deleted file mode 100644
index ce1bcccf8..000000000
--- a/libraries/chart/ofc/ofc_bar_sketch.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-include_once 'ofc_bar_base.php';
-
-class bar_sketch extends bar_base
-{
-	/**
-	 * @param $colour as string, HEX colour e.g. '#00ff00'
-	 * @param $outline_colour as string, HEX colour e.g. '#ff0000'
-	 * @param $fun_factor as integer, range 0 to 10. 0,1 and 2 are pretty boring.
-	 * 4 to 6 is a bit fun, 7 and above is lots of fun. 
-	 */
-	function bar_sketch( $colour, $outline_colour, $fun_factor )
-	{
-		$this->type      = "bar_sketch";
-		parent::bar_base();
-		
-		$this->set_colour( $colour );
-		$this->set_outline_colour( $outline_colour );
-		$this->offset = $fun_factor;
-	}
-	
-	function set_outline_colour( $outline_colour )
-	{
-		$tmp = 'outline-colour';
-		$this->$tmp = $outline_colour;	
-	}
-}
-
diff --git a/libraries/chart/ofc/ofc_bar_stack.php b/libraries/chart/ofc/ofc_bar_stack.php
deleted file mode 100644
index 3d9f8d9f0..000000000
--- a/libraries/chart/ofc/ofc_bar_stack.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-include_once 'ofc_bar_base.php';
-
-class bar_stack extends bar_base
-{
-	function bar_stack()
-	{
-		$this->type      = "bar_stack";
-		parent::bar_base();
-	}
-	
-	function append_stack( $v )
-	{
-		$this->append_value( $v );
-	}
-	
-	// an array of HEX colours strings
-	// e.g. array( '#ff0000', '#00ff00' );
-	function set_colours( $colours )
-	{
-		$this->colours = $colours;
-	}
-	
-	// an array of bar_stack_value
-	function set_keys( $keys )
-	{
-		$this->keys = $keys;
-	}
-}
-
-class bar_stack_value
-{
-	function bar_stack_value( $val, $colour )
-	{
-		$this->val = $val;
-		$this->colour = $colour;
-	}
-	
-	function set_tooltip( $tip )
-	{
-		$this->tip = $tip;
-	} 
-}
-
-class bar_stack_key
-{
-	function bar_stack_key( $colour, $text, $font_size )
-	{
-		$this->colour = $colour;
-		$this->text = $text;
-		$tmp = 'font-size';
-		$this->$tmp = $font_size;
-	}
-}
\ No newline at end of file
diff --git a/libraries/chart/ofc/ofc_candle.php b/libraries/chart/ofc/ofc_candle.php
deleted file mode 100644
index 21ad67f8d..000000000
--- a/libraries/chart/ofc/ofc_candle.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-include_once 'ofc_bar_base.php';
-
-class candle_value
-{
-	/**
-	 *
-	 */
-	function candle_value( $high, $open, $close, $low )
-	{
-		$this->high = $high;
-		$this->top = $open;
-		$this->bottom = $close;
-		$this->low = $low;
-	}
-	
-	function set_colour( $colour )
-	{
-		$this->colour = $colour;
-	}
-	
-	function set_tooltip( $tip )
-	{
-		$this->tip = $tip;
-	}
-}
-
-class candle extends bar_base
-{
-	function candle($colour, $negative_colour=null)
-	{
-		$this->type      = "candle";
-		parent::bar_base();
-		
-		$this->set_colour( $colour );
-		if(!is_null($negative_colour))
-			$this->{'negative-colour'} = $negative_colour;
-	}
-}
-
diff --git a/libraries/chart/ofc/ofc_hbar.php b/libraries/chart/ofc/ofc_hbar.php
deleted file mode 100644
index 6f8c0e451..000000000
--- a/libraries/chart/ofc/ofc_hbar.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-class hbar_value
-{
-	function hbar_value( $left, $right=null )
-	{
-		if( isset( $right ) )
-		{
-			$this->left = $left;
-			$this->right = $right;
-		}
-		else
-			$this->right = $left;
-	}
-	
-	function set_colour( $colour )
-	{
-		$this->colour = $colour;	
-	}
-	
-	function set_tooltip( $tip )
-	{
-		$this->tip = $tip;	
-	}
-}
-
-class hbar
-{
-	function hbar( $colour )
-	{
-		$this->type      = "hbar";
-		$this->values    = array();
-		$this->set_colour( $colour );
-	}
-	
-	function append_value( $v )
-	{
-		$this->values[] = $v;		
-	}
-	
-	function set_values( $v )
-	{
-		foreach( $v as $val )
-			$this->append_value( new hbar_value( $val ) );
-	}
-	
-	function set_colour( $colour )
-	{
-		$this->colour = $colour;	
-	}
-	
-	function set_key( $text, $size )
-	{
-		$this->text = $text;
-		$tmp = 'font-size';
-		$this->$tmp = $size;
-	}
-	
-	function set_tooltip( $tip )
-	{
-		$this->tip = $tip;	
-	}
-}
-
diff --git a/libraries/chart/ofc/ofc_line.php b/libraries/chart/ofc/ofc_line.php
deleted file mode 100644
index e635f2c02..000000000
--- a/libraries/chart/ofc/ofc_line.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-
-class line_on_show
-{
-	/**
-	 *@param $type as string. Can be any one of:
-	 * - 'pop-up'
-	 * - 'explode'
-	 * - 'mid-slide'
-	 * - 'drop'
-	 * - 'fade-in'
-	 * - 'shrink-in'
-	 *
-	 * @param $cascade as float. Cascade in seconds
-	 * @param $delay as float. Delay before animation starts in seconds.
-	 */
-	function __construct($type, $cascade, $delay)
-	{
-		$this->type = $type;
-		$this->cascade = (float)$cascade;
-		$this->delay = (float)$delay;
-	}
-}
-
-class line
-{
-	function line()
-	{
-		$this->type      = "line";
-		$this->values    = array();
-	}
-	
-	/**
-	 * Set the default dot that all the real
-	 * dots inherit their properties from. If you set the
-	 * default dot to be red, all values in your chart that
-	 * do not specify a colour will be red. Same for all the
-	 * other attributes such as tooltip, on-click, size etc...
-	 * 
-	 * @param $style as any class that inherits base_dot
-	 */
-	function set_default_dot_style( $style )
-	{
-		$tmp = 'dot-style';
-		$this->$tmp = $style;	
-	}
-	
-	/**
-	 * @param $v as array, can contain any combination of:
-	 *  - integer, Y position of the point
-	 *  - any class that inherits from dot_base
-	 *  - <b>null</b>
-	 */
-	function set_values( $v )
-	{
-		$this->values = $v;		
-	}
-	
-	/**
-     * Append a value to the line.
-     *
-     * @param mixed $v
-     */
-    function append_value($v)
-    {
-        $this->values[] = $v;       
-    }
-	
-	function set_width( $width )
-	{
-		$this->width = $width;		
-	}
-	
-	function set_colour( $colour )
-	{
-		$this->colour = $colour;
-	}
-	
-	/**
-	 * sytnatical sugar for set_colour
-	 */
-	function colour( $colour )
-	{
-		$this->set_colour( $colour );
-		return $this;
-	}
-	
-	function set_halo_size( $size )
-	{
-		$tmp = 'halo-size';
-		$this->$tmp = $size;		
-	}
-	
-	function set_key( $text, $font_size )
-	{
-		$this->text      = $text;
-		$tmp = 'font-size';
-		$this->$tmp = $font_size;
-	}
-	
-	function set_tooltip( $tip )
-	{
-		$this->tip = $tip;
-	}
-	
-	/**
-	 * @param $text as string. A javascript function name as a string. The chart will
-	 * try to call this function, it will pass the chart id as the only parameter into
-	 * this function. E.g:
-	 * 
-	 */
-	function set_on_click( $text )
-	{
-		$tmp = 'on-click';
-		$this->$tmp = $text;
-	}
-	
-	function loop()
-	{
-		$this->loop = true;
-	}
-	
-	function line_style( $s )
-	{
-		$tmp = "line-style";
-		$this->$tmp = $s;
-	}
-	
-	    /**
-     * Sets the text for the line.
-     *
-     * @param string $text
-     */   
-    function set_text($text)
-    {
-        $this->text = $text;
-    }
-	
-	function attach_to_right_y_axis()
-	{
-		$this->axis = 'right';
-	}
-	
-	/**
-	 *@param $on_show as line_on_show object
-	 */
-	function set_on_show($on_show)
-	{
-		$this->{'on-show'} = $on_show;
-	}
-	
-	function on_show($on_show)
-	{
-		$this->set_on_show($on_show);
-		return $this;
-	}
-}
\ No newline at end of file
diff --git a/libraries/chart/ofc/ofc_line_base.php b/libraries/chart/ofc/ofc_line_base.php
deleted file mode 100644
index fa45cbc89..000000000
--- a/libraries/chart/ofc/ofc_line_base.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-class line_base
-{
-	function line_base()
-	{
-		$this->type      = "line";
-		$this->text      = "Page views";
-		$tmp = 'font-size';
-		$this->$tmp = 10;
-		
-		$this->values    = array();
-	}
-	
-	function set_values( $v )
-	{
-		$this->values = $v;		
-	}
-	
-	/**
-     * Append a value to the line.
-     *
-     * @param mixed $v
-     */
-    function append_value($v)
-    {
-        $this->values[] = $v;       
-    }
-	
-	function set_width( $width )
-	{
-		$this->width = $width;		
-	}
-	
-	function set_colour( $colour )
-	{
-		$this->colour = $colour;
-	}
-	
-	function set_dot_size( $size )
-	{
-		$tmp = 'dot-size';
-		$this->$tmp = $size;		
-	}
-	
-	function set_halo_size( $size )
-	{
-		$tmp = 'halo-size';
-		$this->$tmp = $size;		
-	}
-	
-	function set_key( $text, $font_size )
-	{
-		$this->text      = $text;
-		$tmp = 'font-size';
-		$this->$tmp = $font_size;
-	}
-	
-	function set_tooltip( $tip )
-	{
-		$this->tip = $tip;
-	}
-	
-	function set_on_click( $text )
-	{
-		$tmp = 'on-click';
-		$this->$tmp = $text;
-	}
-	
-	function loop()
-	{
-		$this->loop = true;
-	}
-	
-	function line_style( $s )
-	{
-		$tmp = "line-style";
-		$this->$tmp = $s;
-	}
-	
-	    /**
-     * Sets the text for the line.
-     *
-     * @param string $text
-     */   
-    function set_text($text)
-    {
-        $this->text = $text;
-    }
-	
-	
-}
\ No newline at end of file
diff --git a/libraries/chart/ofc/ofc_line_dot.php b/libraries/chart/ofc/ofc_line_dot.php
deleted file mode 100644
index 146691173..000000000
--- a/libraries/chart/ofc/ofc_line_dot.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-class dot_value
-{
-	function dot_value( $value, $colour )
-	{
-		$this->value = $value;
-		$this->colour = $colour;
-	}
-	
-	function set_colour( $colour )
-	{
-		$this->colour = $colour;
-	}
-	
-	function set_size( $size )
-	{
-		$this->size = $size;
-	}
-	
-	function set_tooltip( $tip )
-	{
-		$this->tip = $tip;
-	}
-}
-
-class line_dot extends line_base
-{
-	function line_dot()
-	{
-		$this->type      = "line_dot";
-	}
-}
\ No newline at end of file
diff --git a/libraries/chart/ofc/ofc_line_hollow.php b/libraries/chart/ofc/ofc_line_hollow.php
deleted file mode 100644
index 512bb07d9..000000000
--- a/libraries/chart/ofc/ofc_line_hollow.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-class line_hollow extends line_base
-{
-	function line_hollow()
-	{
-		$this->type      = "line_hollow";
-	}
-}
\ No newline at end of file
diff --git a/libraries/chart/ofc/ofc_line_style.php b/libraries/chart/ofc/ofc_line_style.php
deleted file mode 100644
index 4f538cf9d..000000000
--- a/libraries/chart/ofc/ofc_line_style.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-class line_style
-{
-	function line_style($on, $off)
-	{
-		$this->style	= "dash";
-		$this->on		= $on;
-		$this->off		= $off;
-	}
-}
\ No newline at end of file
diff --git a/libraries/chart/ofc/ofc_menu.php b/libraries/chart/ofc/ofc_menu.php
deleted file mode 100644
index 0750a09c2..000000000
--- a/libraries/chart/ofc/ofc_menu.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-class ofc_menu_item
-{
-	/**
-	 * @param $text as string. The menu item text.
-	 * @param $javascript_function_name as string. The javascript function name, the
-	 * js function takes one parameter, the chart ID. See ofc_menu_item_camera for
-	 * some example code.
-	 */
-	function ofc_menu_item($text, $javascript_function_name)
-	{
-		$this->type = "text";
-		$this->text = $text;
-		$tmp = 'javascript-function';
-		$this->$tmp = $javascript_function_name;
-	}
-}
-
-class ofc_menu_item_camera
-{
-	/**
-	 * @param $text as string. The menu item text.
-	 * @param $javascript_function_name as string. The javascript function name, the
-	 * js function takes one parameter, the chart ID. So for example, our js function
-	 * could look like this:
-	 *
-	 * function save_image( chart_id )
-	 * {
-	 *     alert( chart_id );
-	 * }
-	 *
-	 * to make a menu item call this: ofc_menu_item_camera('Save chart', 'save_image');
-	 */
-	function ofc_menu_item_camera($text, $javascript_function_name)
-	{
-		$this->type = "camera-icon";
-		$this->text = $text;
-		$tmp = 'javascript-function';
-		$this->$tmp = $javascript_function_name;
-	}
-}
-
-class ofc_menu
-{
-	function ofc_menu($colour, $outline_colour)
-	{
-		$this->colour = $colour;
-		$this->outline_colour = $outline_colour;
-	}
-	
-	function values($values)
-	{
-		$this->values = $values;
-	}
-}
\ No newline at end of file
diff --git a/libraries/chart/ofc/ofc_pie.php b/libraries/chart/ofc/ofc_pie.php
deleted file mode 100644
index bf779c554..000000000
--- a/libraries/chart/ofc/ofc_pie.php
+++ /dev/null
@@ -1,257 +0,0 @@
-<?php
-
-class pie_value
-{
-	function pie_value( $value, $label )
-	{
-		$this->value = $value;
-		$this->label = $label;
-	}
-	
-	function set_colour( $colour )
-	{
-		$this->colour = $colour;
-	}
-	
-	function set_label( $label, $label_colour, $font_size )
-	{
-		$this->label = $label;
-		
-		$tmp = 'label-colour';
-		$this->$tmp = $label_colour;
-		
-		$tmp = 'font-size';
-		$this->$tmp = $font_size;
-		
-	}
-	
-	function set_tooltip( $tip )
-	{
-		$this->tip = $tip;
-	}
-	
-	function on_click( $event )
-	{
-		$tmp = 'on-click';
-		$this->$tmp = $event;
-	}
-	
-	
-	/**
-	 * An object that inherits from base_pie_animation
-	 */
-	function add_animation( $animation )
-	{
-		if( !isset( $this->animate ) )
-			$this->animate = array();
-			
-		$this->animate[] = $animation;
-		
-		return $this;
-	}
-}
-
-class base_pie_animation{}
-
-/**
- * fade the pie slice from $alpha (pie set_alpha) to 100% opaque.
- */
-class pie_fade extends base_pie_animation
-{
-	function pie_fade()
-	{
-		$this->type="fade";
-	}
-}
-
-/**
- * Bounce the pie slice out a little
- */
-class pie_bounce extends base_pie_animation
-{
-	/**
-	 * @param $distance as integer, distance to bounce in pixels
-	 */
-	function pie_bounce( $distance )
-	{
-		$this->type="bounce";
-		$this->distance = $distance;
-	}
-}
-
-/**
- * Make a pie chart and fill it with pie slices
- */
-class pie
-{
-	function pie()
-	{
-		$this->type      		= 'pie';
-	}
-	
-	function set_colours( $colours )
-	{
-		$this->colours = $colours;
-	}
-	
-	/**
-	 * Sugar wrapped around set_colours
-	 */
-	function colours( $colours )
-	{
-		$this->set_colours( $colours );
-		return $this;
-	}
-	
-	/**
-	 * @param $alpha as float (0-1) 0.75 = 3/4 visible
-	 */
-	function set_alpha( $alpha )
-	{
-		$this->alpha = $alpha;
-	}
-	
-	/**
-	 *sugar wrapped set_alpha
-	 **/
-	function alpha( $alpha )
-	{
-		$this->set_alpha( $alpha );
-		return $this;
-	}
-	
-	/**
-	 * @param $v as array containing one of
-	 *  - null
-	 *  - real or integer number
-	 *  - a pie_value object
-	 */
-	function set_values( $v )
-	{
-		$this->values = $v;		
-	}
-
-	/**
-	 * sugar for set_values
-	 */
-	function values( $v )
-	{
-		$this->set_values( $v );
-		return $this;
-	}
-	
-	/**
-	 * HACK to keep old code working.
-	 */
-	function set_animate( $bool )
-	{
-		if( $bool )
-			$this->add_animation( new pie_fade() );
-			
-	}
-	
-	/**
-	 * An object that inherits from base_pie_animation
-	 */
-	function add_animation( $animation )
-	{
-		if( !isset( $this->animate ) )
-			$this->animate = array();
-			
-		$this->animate[] = $animation;
-		
-		return $this;
-	}
-	
-	/**
-	 * @param $angle as real number
-	 */
-	function set_start_angle( $angle )
-	{
-		$tmp = 'start-angle';
-		$this->$tmp = $angle;
-	}
-	
-	/**
-	 * sugar for set_start_angle
-	 */
-	function start_angle($angle)
-	{
-		$this->set_start_angle( $angle );
-		return $this;
-	}
-	
-	/**
-	 * @param $tip as string. The tooltip text. May contain magic varibles
-	 */
-	function set_tooltip( $tip )
-	{
-		$this->tip = $tip;
-	}
-	
-	/**
-	 * sugar for set_tooltip
-	 */
-	function tooltip( $tip )
-	{
-		$this->set_tooltip( $tip );
-		return $this;
-	}
-	
-	function set_gradient_fill()
-	{
-		$tmp = 'gradient-fill';
-		$this->$tmp = true;
-	}
-	
-	function gradient_fill()
-	{
-		$this->set_gradient_fill();
-		return $this;
-	}
-	
-	/**
-	 * By default each label is the same colour as the slice,
-	 * but you can ovveride that behaviour using this method.
-	 * 
-	 * @param $label_colour as string HEX colour;
-	 */
-	function set_label_colour( $label_colour )
-	{
-		$tmp = 'label-colour';
-		$this->$tmp = $label_colour;	
-	}
-	
-	function label_colour( $label_colour )
-	{
-		$this->set_label_colour( $label_colour );
-		return $this;
-	}
-	
-	/**
-	 * Turn off the labels
-	 */
-	function set_no_labels()
-	{
-		$tmp = 'no-labels';
-		$this->$tmp = true;
-	}
-	
-	function on_click( $event )
-	{
-		$tmp = 'on-click';
-		$this->$tmp = $event;
-	}
-	
-	/**
-	 * Fix the radius of the pie chart. Take a look at the magic variable #radius#
-	 * for helping figure out what radius to set it to.
-	 * 
-	 * @param $radius as number
-	 */
-	function radius( $radius )
-	{
-		$this->radius = $radius;
-		return $this;
-	}
-}
diff --git a/libraries/chart/ofc/ofc_radar_axis.php b/libraries/chart/ofc/ofc_radar_axis.php
deleted file mode 100644
index 909c41af8..000000000
--- a/libraries/chart/ofc/ofc_radar_axis.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-class radar_axis
-{
-	function radar_axis( $max )
-	{
-		$this->set_max( $max );
-	}
-	
-	function set_max( $max )
-	{
-		$this->max = $max;
-	}
-	
-	function set_steps( $steps )
-	{
-		$this->steps = $steps;
-	}
-	
-	function set_stroke( $s )
-	{
-		$this->stroke = $s;
-	}
-    
-	function set_colour( $colour )
-	{
-		$this->colour = $colour;
-	}
-	
-	function set_grid_colour( $colour )
-	{
-		$tmp = 'grid-colour';
-		$this->$tmp = $colour;
-	}
-	
-	function set_labels( $labels )
-	{
-		$this->labels = $labels;
-	}
-	
-	function set_spoke_labels( $labels )
-	{
-		$tmp = 'spoke-labels';
-		$this->$tmp = $labels;
-	}
-}
-
diff --git a/libraries/chart/ofc/ofc_radar_axis_labels.php b/libraries/chart/ofc/ofc_radar_axis_labels.php
deleted file mode 100644
index 22d485e4e..000000000
--- a/libraries/chart/ofc/ofc_radar_axis_labels.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-class radar_axis_labels
-{
-	// $labels : array
-	function radar_axis_labels( $labels )
-	{
-		$this->labels = $labels;
-	}
-	
-	function set_colour( $colour )
-	{
-		$this->colour = $colour;
-	}
-}
\ No newline at end of file
diff --git a/libraries/chart/ofc/ofc_radar_spoke_labels.php b/libraries/chart/ofc/ofc_radar_spoke_labels.php
deleted file mode 100644
index 51ba25e9a..000000000
--- a/libraries/chart/ofc/ofc_radar_spoke_labels.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-class radar_spoke_labels
-{
-	// $labels : array
-	function radar_spoke_labels( $labels )
-	{
-		$this->labels = $labels;
-	}
-	
-	function set_colour( $colour )
-	{
-		$this->colour = $colour;
-	}
-}
\ No newline at end of file
diff --git a/libraries/chart/ofc/ofc_scatter.php b/libraries/chart/ofc/ofc_scatter.php
deleted file mode 100644
index 7159a3a64..000000000
--- a/libraries/chart/ofc/ofc_scatter.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-class scatter_value
-{
-	function scatter_value( $x, $y, $dot_size=-1 )
-	{
-		$this->x = $x;
-		$this->y = $y;
-		
-		if( $dot_size > 0 )
-		{
-			$tmp = 'dot-size';
-			$this->$tmp = $dot_size;
-		}
-	}
-}
-
-class scatter
-{
-	function scatter( $colour )
-	{
-		$this->type      = "scatter";
-		$this->set_colour( $colour );
-	}
-	
-	function set_colour( $colour )
-	{
-		$this->colour = $colour;
-	}
-
-	function set_default_dot_style( $style )
-	{
-		$tmp = 'dot-style';
-		$this->$tmp = $style;	
-	}
-	
-	/**
-	 * @param $v as array, can contain any combination of:
-	 *  - integer, Y position of the point
-	 *  - any class that inherits from scatter_value
-	 *  - <b>null</b>
-	 */
-	function set_values( $values )
-	{
-		$this->values = $values;
-	}
-}
diff --git a/libraries/chart/ofc/ofc_scatter_line.php b/libraries/chart/ofc/ofc_scatter_line.php
deleted file mode 100644
index d667d7e8c..000000000
--- a/libraries/chart/ofc/ofc_scatter_line.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-class scatter_line
-{
-	function scatter_line( $colour, $width  )
-	{
-		$this->type      = "scatter_line";
-		$this->set_colour( $colour );
-		$this->set_width( $width );
-	}
-	
-	function set_default_dot_style( $style )
-	{
-		$tmp = 'dot-style';
-		$this->$tmp = $style;	
-	}
-	
-	function set_colour( $colour )
-	{
-		$this->colour = $colour;
-	}
-	
-	function set_width( $width )
-	{
-		$this->width = $width;
-	}
-	
-	function set_values( $values )
-	{
-		$this->values = $values;
-	}
-	
-	function set_step_horizontal()
-	{
-		$this->stepgraph = 'horizontal';
-	}
-	
-	function set_step_vertical()
-	{
-		$this->stepgraph = 'vertical';
-	}
-	
-	function set_key( $text, $font_size )
-	{
-		$this->text      = $text;
-		$tmp = 'font-size';
-		$this->$tmp = $font_size;
-	}
-}
\ No newline at end of file
diff --git a/libraries/chart/ofc/ofc_shape.php b/libraries/chart/ofc/ofc_shape.php
deleted file mode 100644
index 0cfe39f9b..000000000
--- a/libraries/chart/ofc/ofc_shape.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-class shape_point
-{
-	function shape_point( $x, $y )
-	{
-		$this->x = $x;
-		$this->y = $y;
-	}
-}
-
-class shape
-{
-	function shape( $colour )
-	{
-		$this->type		= "shape";
-		$this->colour	= $colour;
-		$this->values	= array();
-	}
-	
-	function append_value( $p )
-	{
-		$this->values[] = $p;	
-	}
-}
\ No newline at end of file
diff --git a/libraries/chart/ofc/ofc_sugar.php b/libraries/chart/ofc/ofc_sugar.php
deleted file mode 100644
index a9e85555e..000000000
--- a/libraries/chart/ofc/ofc_sugar.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * Sugar: to make stars easier sometimes
- */
-class s_star extends star
-{
-	/**
-	 * I use this wrapper for default dot types,
-	 * it just makes the code easier to read.
-	 */
-	function s_star($colour, $size)
-	{
-		parent::star();
-		$this->colour($colour)->size($size);
-	}
-}
-
-class s_box extends anchor
-{
-	/**
-	 * I use this wrapper for default dot types,
-	 * it just makes the code easier to read.
-	 */
-	function s_box($colour, $size)
-	{
-		parent::anchor();
-		$this->colour($colour)->size($size)->rotation(45)->sides(4);
-	}
-}
-
-class s_hollow_dot extends hollow_dot
-{
-	/**
-	 * I use this wrapper for default dot types,
-	 * it just makes the code easier to read.
-	 */
-	function s_hollow_dot($colour, $size)
-	{
-		parent::hollow_dot();
-		$this->colour($colour)->size($size);
-	}
-}
\ No newline at end of file
diff --git a/libraries/chart/ofc/ofc_tags.php b/libraries/chart/ofc/ofc_tags.php
deleted file mode 100644
index 7e7e24454..000000000
--- a/libraries/chart/ofc/ofc_tags.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-
-class ofc_tags
-{
-	function ofc_tags()
-	{
-		$this->type      = "tags";
-		$this->values	= array();
-	}
-	
-	function colour( $colour )
-	{
-		$this->colour = $colour;
-		return $this;
-	}
-	
-	/**
-	 *@param $font as string. e.g. "Verdana"
-	 *@param $size as integer. Size in px
-	 */
-	function font($font, $size)
-	{
-		$this->font = $font;
-		$this->{'font-size'} = $size;
-		return $this;
-	}
-
-	/**
-	 *@param $x as integer. Size of x padding in px
-	 *@param $y as integer. Size of y padding in px
-	 */
-	function padding($x, $y)
-	{
-		$this->{"pad-x"} = $x;
-		$this->{"pad-y"} = $y;
-		return $this;
-	}
-	
-	function rotate($angle)
-	{
-		$this->rotate($angle);
-		return $this;
-	}
-	
-	function align_x_center()
-	{
-		$this->{"align-x"} = "center";
-		return $this;
-	}
-	
-	function align_x_left()
-	{
-		$this->{"align-x"} = "left";
-		return $this;
-	}
-	
-	function align_x_right()
-	{
-		$this->{"align-x"} = "right";
-		return $this;
-	}
-	
-	function align_y_above()
-	{
-		$this->{"align-y"} = "above";
-		return $this;
-	}
-	
-	function align_y_below()
-	{
-		$this->{"align-y"} = "below";
-		return $this;
-	}
-	
-	function align_y_center()
-	{
-		$this->{"align-y"} = "center";
-		return $this;
-	}
-	
-	/**
-	 * This can contain some HTML, e.g:
-	 *  - "More <a href="javascript:alert(12);">info</a>"
-	 *  - "<a href="http://teethgrinder.co.uk">ofc</a>"
-	 */
-	function text($text)
-	{
-		$this->text = $text;
-		return $this;
-	}
-	
-	/**
-	 * This works, but to get the mouse pointer to change
-	 * to a little hand you need to use "<a href="">stuff</a>"-- see text()
-	 */
-	function on_click($on_click)
-	{
-		$this->{'on-click'} = $on_click;
-		return $this;
-	}
-	
-	/**
-	 *@param $bold boolean.
-	 *@param $underline boolean.
-	 *@param $border boolean.
-	 *@prarm $alpha real (0 to 1.0)
-	 */
-	function style($bold, $underline, $border, $alpha )
-	{
-		$this->bold = $bold;
-		$this->border = $underline;
-		$this->underline = $border;
-		$this->alpha = $alpha;
-		return $this;
-	}
-	
-	/**
-	 *@param $tag as ofc_tag
-	 */
-	function append_tag($tag)
-	{
-		$this->values[] = $tag;
-	}
-}
-
-class ofc_tag extends ofc_tags
-{
-	function ofc_tag($x, $y)
-	{
-		$this->x = $x;
-		$this->y = $y;
-	}
-}
\ No newline at end of file
diff --git a/libraries/chart/ofc/ofc_title.php b/libraries/chart/ofc/ofc_title.php
deleted file mode 100644
index cda1de006..000000000
--- a/libraries/chart/ofc/ofc_title.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Set the title of a chart, make one of these and pass it into
- * open_flash_chart set_title
- */
-class title
-{
-	function title( $text='' )
-	{
-		$this->text = $text;
-	}
-	
-	/**
-	 * A css string. Can optionally contain:
-     * - font-size
-     * - font-family
-     * - font-weight
-     * - color
-     * - background-color
-     * - text-align
-     * - margin
-     * - margin-left
-     * - margin-right
-     * - margin-top
-     * - margin-bottom
-     * - padding
-     * - padding-left
-     * - padding-right
-     * - padding-top
-     * - padding-bottom
-     * just like the css we use all the time :-)
-	 */
-	function set_style( $css )
-	{
-		$this->style = $css;
-		//"{font-size: 20px; color:#0000ff; font-family: Verdana; text-align: center;}";		
-	}
-}
\ No newline at end of file
diff --git a/libraries/chart/ofc/ofc_tooltip.php b/libraries/chart/ofc/ofc_tooltip.php
deleted file mode 100644
index 3104ee33b..000000000
--- a/libraries/chart/ofc/ofc_tooltip.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-include_once 'ofc_bar_base.php';
-
-class tooltip
-{
-	function tooltip(){}
-	
-	/**
-	 * @param $shadow as boolean. Enable drop shadow.
-	 */
-	function set_shadow( $shadow )
-	{
-		$this->shadow = $shadow;
-	}
-	
-	/**
-	 * @param $stroke as integer, border width in pixels (e.g. 5 )
-	 */
-	function set_stroke( $stroke )
-	{
-		$this->stroke = $stroke;
-	}
-	
-	/**
-	 * @param $colour as string, HEX colour e.g. '#0000ff'
-	 */
-	function set_colour( $colour )
-	{
-		$this->colour = $colour;
-	}
-	
-	/**
-	 * @param $bg as string, HEX colour e.g. '#0000ff'
-	 */
-	function set_background_colour( $bg )
-	{
-		$this->background = $bg;
-	}
-	
-	/**
-	 * @param $style as string. A css style.
-	 */
-	function set_title_style( $style )
-	{
-		$this->title = $style;
-	}
-	
-	/**
-	 * @param $style as string. A css style.
-	 */
-    function set_body_style( $style )
-	{
-		$this->body = $style;
-	}
-	
-	function set_proximity()
-	{
-		$this->mouse = 1;
-	}
-	
-	function set_hover()
-	{
-		$this->mouse = 2;
-	}
-}
-
diff --git a/libraries/chart/ofc/ofc_upload_image.php b/libraries/chart/ofc/ofc_upload_image.php
deleted file mode 100644
index 0261f9aea..000000000
--- a/libraries/chart/ofc/ofc_upload_image.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-//
-// In Open Flash Chart -> save_image debug mode, you
-// will see the 'echo' text in a new window.
-//
-
-/*
- 
-print_r( $_GET );
-print_r( $_POST );
-print_r( $_FILES );
-
-print_r( $GLOBALS );
-print_r( $GLOBALS["HTTP_RAW_POST_DATA"] );
-
-*/
-
-
-// default path for the image to be stored //
-$default_path = '../tmp-upload-images/';
-
-if (!file_exists($default_path)) mkdir($default_path, 0777, true);
-
-// full path to the saved image including filename //
-$destination = $default_path . basename( $_GET[ 'name' ] ); 
-
-echo 'Saving your image to: '. $destination;
-// print_r( $_POST );
-// print_r( $_SERVER );
-// echo $HTTP_RAW_POST_DATA;
-
-//
-// POST data is usually string data, but we are passing a RAW .png
-// so PHP is a bit confused and $_POST is empty. But it has saved
-// the raw bits into $HTTP_RAW_POST_DATA
-//
-
-$jfh = fopen($destination, 'w') or die("can't open file");
-fwrite($jfh, $HTTP_RAW_POST_DATA);
-fclose($jfh);
-
-//
-// LOOK:
-//
-exit();
-
-
-//
-// PHP5:
-//
-
-
-// default path for the image to be stored //
-$default_path = 'tmp-upload-images/';
-
-if (!file_exists($default_path)) mkdir($default_path, 0777, true);
-
-// full path to the saved image including filename //
-$destination = $default_path . basename( $_FILES[ 'Filedata' ][ 'name' ] ); 
-
-// move the image into the specified directory //
-if (move_uploaded_file($_FILES[ 'Filedata' ][ 'tmp_name' ], $destination)) {
-    echo "The file " . basename( $_FILES[ 'Filedata' ][ 'name' ] ) . " has been uploaded;";
-} else {
-    echo "FILE UPLOAD FAILED";
-}
-
-
-?>
diff --git a/libraries/chart/ofc/ofc_x_axis.php b/libraries/chart/ofc/ofc_x_axis.php
deleted file mode 100644
index da1c7672b..000000000
--- a/libraries/chart/ofc/ofc_x_axis.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-
-class x_axis
-{
-	function x_axis(){}
-
-	/**
-	 * @param $stroke as integer, with of the line and ticks
-	 */
-	function set_stroke( $stroke )
-	{
-		$this->stroke = $stroke;	
-	}
-	
-	function stroke( $stroke )
-	{
-		$this->set_stroke( $stroke );
-		return $this;
-	}
-	
-	/**
-	 *@param $colour as string HEX colour
-	 *@param $grid_colour as string HEX colour
-	 */
-	function set_colours( $colour, $grid_colour )
-	{
-		$this->set_colour( $colour );
-		$this->set_grid_colour( $grid_colour );
-	}
-	
-	/**
-	 *@param $colour as string HEX colour
-	 */
-	function set_colour( $colour )
-	{
-		$this->colour = $colour;	
-	}
-	
-	function colour( $colour )
-	{
-		$this->set_colour($colour);
-		return $this;
-	}
-	
-	function set_tick_height( $height )
-	{
-		$tmp = 'tick-height';
-		$this->$tmp      		= $height;
-	}
-	
-	function tick_height( $height )
-	{
-		$this->set_tick_height($height);
-		return $this;
-	}
-	
-	function set_grid_colour( $colour )
-	{
-		$tmp = 'grid-colour';
-		$this->$tmp = $colour;
-	}
-	
-	function grid_colour( $colour )
-	{
-		$this->set_grid_colour($colour);
-		return $this;
-	}
-	
-	/**
-	 * @param $o is a boolean. If true, the X axis start half a step in
-	 * This defaults to True
-	 */
-	function set_offset( $o )
-	{
-		$this->offset = $o?true:false;	
-	}
-	
-	function offset( $o )
-	{
-		$this->set_offset($o);
-		return $this;
-	}
-	
-	/**
-	 * @param $steps as integer. Which grid lines and ticks are visible.
-	 */
-	function set_steps( $steps )
-	{
-		$this->steps = $steps;
-	}
-	
-	function steps( $steps )
-	{
-		$this->set_steps($steps);
-		return $this;
-	}
-	
-	/**
-	 * @param $val as an integer, the height in pixels of the 3D bar. Mostly
-	 * used for the 3D bar chart.
-	 */
-	function set_3d( $val )
-	{
-		$tmp = '3d';
-		$this->$tmp				= $val;		
-	}
-	
-	/**
-	 * @param $x_axis_labels as an x_axis_labels object
-	 * Use this to customize the labels (colour, font, etc...)
-	 */
-	function set_labels( $x_axis_labels )
-	{
-		//$this->labels = $v;
-		$this->labels = $x_axis_labels;
-	}
-	
-	/**
-	 * Sugar syntax: helper function to make the examples simpler.
-	 * @param $a is an array of labels
-	 */
-	function set_labels_from_array( $a )
-	{
-		$x_axis_labels = new x_axis_labels();
-		$x_axis_labels->set_labels( $a );
-		$this->labels = $x_axis_labels;
-		
-		if( isset( $this->steps ) )
-			$x_axis_labels->set_steps( $this->steps );
-	}
-	
-	/**
-	 * min and max.
-	 */
-	function set_range( $min, $max )
-	{
-		$this->min = $min;
-		$this->max = $max;
-	}
-}
\ No newline at end of file
diff --git a/libraries/chart/ofc/ofc_x_axis_label.php b/libraries/chart/ofc/ofc_x_axis_label.php
deleted file mode 100644
index cf116f15f..000000000
--- a/libraries/chart/ofc/ofc_x_axis_label.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
- * x_axis_label see x_axis_labels
- */
-class x_axis_label
-{
-	function x_axis_label( $text, $colour, $size, $rotate )
-	{
-		$this->set_text( $text );
-		$this->set_colour( $colour );
-		$this->set_size( $size );
-		$this->set_rotate( $rotate );
-	}
-	
-	function set_text( $text )
-	{
-		$this->text = $text;
-	}
-	
-	function set_colour( $colour )
-	{
-		$this->colour = $colour;
-	}
-	
-	function set_size( $size )
-	{
-		$this->size = $size;
-	}
-	
-	function set_rotate( $rotate )
-	{
-		$this->rotate = $rotate;
-	}
-	
-	function set_vertical()
-	{
-		$this->rotate = "vertical";
-	}
-	
-	function set_visible()
-	{
-		$this->visible = true;
-	}
-}
\ No newline at end of file
diff --git a/libraries/chart/ofc/ofc_x_axis_labels.php b/libraries/chart/ofc/ofc_x_axis_labels.php
deleted file mode 100644
index af4540f95..000000000
--- a/libraries/chart/ofc/ofc_x_axis_labels.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-class x_axis_labels
-{
-	function x_axis_labels(){}
-	
-	/**
-	 * @param $steps which labels are generated
-	 */
-	function set_steps( $steps )
-	{
-		$this->steps = $steps;
-	}
-	
-	/**
-	 * @param $steps as integer which labels are visible
-	 */
-	function visible_steps( $steps )
-	{
-		$this->{"visible-steps"} = $steps;
-		return $this;
-	}
-	
-	/**
-	 *
-	 * @param $labels as an array of [x_axis_label or string]
-	 */
-	function set_labels( $labels )
-	{
-		$this->labels = $labels;
-	}
-	
-	function set_colour( $colour )
-	{
-		$this->colour = $colour;
-	}
-	
-	/**
-	 * font size in pixels
-	 */
-	function set_size( $size )
-	{
-		$this->size = $size;
-	}
-	
-	/**
-	 * rotate labels
-	 */
-	function set_vertical()
-	{
-		$this->rotate = 270;
-	}
-	
-	/**
-	 * @param @angle as real. The angle of the text.
-	 */
-	function rotate( $angle )
-	{
-		$this->rotate = $angle;
-	}
-	
-	/**
-	 * @param $text as string. Replace and magic variables with actual x axis position.
-	 */
-	function text( $text )
-	{
-		$this->text = $text;
-	}
-}
\ No newline at end of file
diff --git a/libraries/chart/ofc/ofc_x_legend.php b/libraries/chart/ofc/ofc_x_legend.php
deleted file mode 100644
index 7a25af0c2..000000000
--- a/libraries/chart/ofc/ofc_x_legend.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-class x_legend
-{
-	function x_legend( $text='' )
-	{
-		$this->text = $text;
-	}
-	
-	function set_style( $css )
-	{
-		$this->style = $css;
-		//"{font-size: 20px; color:#0000ff; font-family: Verdana; text-align: center;}";		
-	}
-}
\ No newline at end of file
diff --git a/libraries/chart/ofc/ofc_y_axis.php b/libraries/chart/ofc/ofc_y_axis.php
deleted file mode 100644
index 3846c9285..000000000
--- a/libraries/chart/ofc/ofc_y_axis.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-class y_axis extends y_axis_base
-{
-	function y_axis(){}
-	
-	/**
-	 * @param $colour as string. The grid are the lines inside the chart.
-	 * HEX colour, e.g. '#ff0000'
-	 */
-	function set_grid_colour( $colour )
-	{
-		$tmp = 'grid-colour';
-		$this->$tmp = $colour;
-	}
-	
-}
\ No newline at end of file
diff --git a/libraries/chart/ofc/ofc_y_axis_base.php b/libraries/chart/ofc/ofc_y_axis_base.php
deleted file mode 100644
index 8093a09e5..000000000
--- a/libraries/chart/ofc/ofc_y_axis_base.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-
-class y_axis_base
-{
-	function y_axis_base(){}
-	
-	/**
-	 * @param $s as integer, thickness of the Y axis line
-	 */
-	function set_stroke( $s )
-	{
-		$this->stroke = $s;
-	}
-	
-	/**
-	 * @param $val as integer. The length of the ticks in pixels
-	 */
-	function set_tick_length( $val )
-	{
-		$tmp = 'tick-length';
-		$this->$tmp = $val;
-	}
-	
-	function set_colours( $colour, $grid_colour )
-	{
-		$this->set_colour( $colour );
-		$this->set_grid_colour( $grid_colour );
-	}
-	
-	function set_colour( $colour )
-	{
-		$this->colour = $colour;
-	}
-	
-	function set_grid_colour( $colour )
-	{
-		$tmp = 'grid-colour';
-		$this->$tmp = $colour;
-	}
-	
-	/**
-	 * Set min and max values, also (optionally) set the steps value.
-	 * You can reverse the chart by setting min larger than max, e.g. min = 10
-	 * and max = 0.
-	 * 
-	 * @param $min as integer
-	 * @param $max as integer
-	 * @param $steps as integer.
-	 */
-	function set_range( $min, $max, $steps=1 )
-	{
-		$this->min = $min;
-		$this->max = $max;
-		$this->set_steps( $steps );
-	}
-	
-	/**
-	 * Sugar for set_range
-	 */
-	function range( $min, $max, $steps=1 )
-	{
-		$this->set_range( $min, $max, $steps );
-		return $this;
-	}
-	
-	/**
-	 * @param $off as Boolean. If true the Y axis is nudged up half a step.
-	 */
-	function set_offset( $off )
-	{
-		$this->offset = $off?1:0;
-	}
-	
-	/**
-	 * @param $y_axis_labels as an y_axis_labels object
-	 * Use this to customize the labels (colour, font, etc...)
-	 */
-	function set_labels( $y_axis_labels )
-	{
-		$this->labels = $y_axis_labels;
-	}
-	
-	/**
-	 * Pass in some text for each label. This can contain magic variables "#val#" which
-	 * will get replaced with the value for that Y axis label. Useful for:
-	 * - "£#val#"
-	 * - "#val#%"
-	 * - "#val# million"
-	 * 
-	 * @param $text as string.
-	 */
-	function set_label_text( $text )
-	{
-		$tmp = new y_axis_labels();
-		$tmp->set_text( $text );
-		$this->labels = $tmp;
-	}
-	
-	/**
-	 * @param $steps as integer.
-	 *
-	 * Only show every $steps label, e.g. every 10th
-	 */
-	function set_steps( $steps )
-	{
-		$this->steps = $steps;	
-	}
-	
-	/**
-	 * Make the labels show vertical
-	 */
-	function set_vertical()
-	{
-		$this->rotate = "vertical";
-	}
-}
\ No newline at end of file
diff --git a/libraries/chart/ofc/ofc_y_axis_label.php b/libraries/chart/ofc/ofc_y_axis_label.php
deleted file mode 100644
index f2616f537..000000000
--- a/libraries/chart/ofc/ofc_y_axis_label.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/**
- * y_axis_label see y_axis_labels
- */
-class y_axis_label
-{
-	function y_axis_label( $y, $text)
-	{
-		$this->y = $y;
-		$this->set_text( $text );
-	}
-	
-	function set_text( $text )
-	{
-		$this->text = $text;
-	}
-	
-	function set_colour( $colour )
-	{
-		$this->colour = $colour;
-	}
-	
-	function set_size( $size )
-	{
-		$this->size = $size;
-	}
-	
-	function set_rotate( $rotate )
-	{
-		$this->rotate = $rotate;
-	}
-	
-	function set_vertical()
-	{
-		$this->rotate = "vertical";
-	}
-}
\ No newline at end of file
diff --git a/libraries/chart/ofc/ofc_y_axis_labels.php b/libraries/chart/ofc/ofc_y_axis_labels.php
deleted file mode 100644
index c0708ab21..000000000
--- a/libraries/chart/ofc/ofc_y_axis_labels.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-class y_axis_labels
-{
-	function y_axis_labels(){}
-	
-	/**
-	 * @param $steps which labels are generated
-	 */
-	function set_steps( $steps )
-	{
-		$this->steps = $steps;
-	}
-	
-	/**
-	 *
-	 * @param $labels as an array of [y_axis_label or string]
-	 */
-	function set_labels( $labels )
-	{
-		$this->labels = $labels;
-	}
-	
-	function set_colour( $colour )
-	{
-		$this->colour = $colour;
-	}
-	
-	/**
-	 * font size in pixels
-	 */
-	function set_size( $size )
-	{
-		$this->size = $size;
-	}
-	
-	/**
-	 * rotate labels
-	 */
-	function set_vertical()
-	{
-		$this->rotate = 270;
-	}
-	
-	function rotate( $angle )
-	{
-		$this->rotate = $angle;
-	}
-	
-	/**
-	 * @param $text default text that all labels inherit
-	 */
-	function set_text( $text )
-	{
-		$this->text = $text;
-	}
-}
\ No newline at end of file
diff --git a/libraries/chart/ofc/ofc_y_axis_right.php b/libraries/chart/ofc/ofc_y_axis_right.php
deleted file mode 100644
index 71f7c2984..000000000
--- a/libraries/chart/ofc/ofc_y_axis_right.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-class y_axis_right extends y_axis_base
-{
-	function y_axis_right(){}
-}
\ No newline at end of file
diff --git a/libraries/chart/ofc/ofc_y_legend.php b/libraries/chart/ofc/ofc_y_legend.php
deleted file mode 100644
index 048d8b51e..000000000
--- a/libraries/chart/ofc/ofc_y_legend.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-class y_legend
-{
-	function y_legend( $text='' )
-	{
-		$this->text = $text;
-	}
-	
-	function set_style( $css )
-	{
-		$this->style = $css;
-		//"{font-size: 20px; color:#0000ff; font-family: Verdana; text-align: center;}";		
-	}
-}
\ No newline at end of file
diff --git a/libraries/chart/ofc/open-flash-chart.php b/libraries/chart/ofc/open-flash-chart.php
deleted file mode 100644
index b017097d0..000000000
--- a/libraries/chart/ofc/open-flash-chart.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<?php
-
-// var_dump(debug_backtrace());
-
-//
-// Omar Kilani's php C extension for encoding JSON has been incorporated in stock PHP since 5.2.0
-// http://www.aurore.net/projects/php-json/
-//
-// -- Marcus Engene
-//
-if (! function_exists('json_encode'))
-{
-	include_once 'JSON.php';
-}
-
-include_once 'json_format.php';
-
-// ofc classes
-include_once 'ofc_title.php';
-include_once 'ofc_y_axis_base.php';
-include_once 'ofc_y_axis.php';
-include_once 'ofc_y_axis_right.php';
-include_once 'ofc_y_axis_labels.php';
-include_once 'ofc_y_axis_label.php';
-include_once 'ofc_x_axis.php';
-
-
-include_once 'ofc_pie.php';
-//include_once 'ofc_bar.php';
-include_once 'ofc_bar_glass.php';
-include_once 'ofc_bar_filled.php';
-include_once 'ofc_bar_stack.php';
-//include_once 'ofc_bar_3d.php';
-include_once 'ofc_hbar.php';
-include_once 'ofc_line_base.php';
-include_once 'ofc_line.php';
-//include_once 'ofc_line_dot.php';
-//include_once 'ofc_line_hollow.php';
-include_once 'ofc_candle.php';
-include_once 'ofc_area_base.php';
-include_once 'ofc_tags.php';
-include_once 'ofc_arrow.php';
-//include_once 'ofc_area_hollow.php';
-//include_once 'ofc_area_line.php';
-
-include_once 'ofc_x_legend.php';
-include_once 'ofc_y_legend.php';
-include_once 'ofc_bar_sketch.php';
-include_once 'ofc_scatter.php';
-include_once 'ofc_scatter_line.php';
-include_once 'ofc_x_axis_labels.php';
-include_once 'ofc_x_axis_label.php';
-include_once 'ofc_tooltip.php';
-include_once 'ofc_shape.php';
-include_once 'ofc_radar_axis.php';
-include_once 'ofc_radar_axis_labels.php';
-include_once 'ofc_radar_spoke_labels.php';
-include_once 'ofc_line_style.php';
-
-include_once 'dot_base.php';
-include_once 'ofc_menu.php';
-
-class open_flash_chart
-{
-	function open_flash_chart()
-	{
-		//$this->title = new title( "Many data lines" );
-		$this->elements = array();
-	}
-	
-	function set_title( $t )
-	{
-		$this->title = $t;
-	}
-	
-	function set_x_axis( $x )
-	{
-		$this->x_axis = $x;	
-	}
-	
-	function set_y_axis( $y )
-	{
-		$this->y_axis = $y;
-	}
-	
-	function add_y_axis( $y )
-	{
-		$this->y_axis = $y;
-	}
-
-	function set_y_axis_right( $y )
-	{
-		$this->y_axis_right = $y;
-	}
-	
-	function add_element( $e )
-	{
-		$this->elements[] = $e;
-	}
-	
-	function set_x_legend( $x )
-	{
-		$this->x_legend = $x;
-	}
-
-	function set_y_legend( $y )
-	{
-		$this->y_legend = $y;
-	}
-	
-	function set_bg_colour( $colour )
-	{
-		$this->bg_colour = $colour;	
-	}
-	
-	function set_radar_axis( $radar )
-	{
-		$this->radar_axis = $radar;
-	}
-	
-	function set_tooltip( $tooltip )
-	{
-		$this->tooltip = $tooltip;	
-	}
-	
-	/**
-	 * This is a bit funky :(
-	 *
-	 * @param $num_decimals as integer. Truncate the decimals to $num_decimals, e.g. set it
-	 * to 5 and 3.333333333 will display as 3.33333. 2.0 will display as 2 (or 2.00000 - see below)
-	 * @param $is_fixed_num_decimals_forced as boolean. If true it will pad the decimals.
-	 * @param $is_decimal_separator_comma as boolean
-	 * @param $is_thousand_separator_disabled as boolean
-	 *
-	 * This needs a bit of love and attention
-	 */
-	function set_number_format($num_decimals, $is_fixed_num_decimals_forced, $is_decimal_separator_comma, $is_thousand_separator_disabled )
-	{
-		$this->num_decimals = $num_decimals;
-		$this->is_fixed_num_decimals_forced = $is_fixed_num_decimals_forced;
-		$this->is_decimal_separator_comma = $is_decimal_separator_comma;
-		$this->is_thousand_separator_disabled = $is_thousand_separator_disabled;
-	}
-	
-	/**
-	 * This is experimental and will change as we make it work
-	 * 
-	 * @param $m as ofc_menu
-	 */
-	function set_menu($m)
-	{
-		$this->menu = $m;
-	}
-	
-	function toString()
-	{
-		if (function_exists('json_encode'))
-		{
-			return json_encode($this);
-		}
-		else
-		{
-			$json = new Services_JSON();
-			return $json->encode( $this );
-		}
-	}
-	
-	function toPrettyString()
-	{
-		return json_format( $this->toString() );
-	}
-}
-
-
-
-//
-// there is no PHP end tag so we don't mess the headers up!
-//
\ No newline at end of file