Update CDF for Pentaho 5x use the latest stable build.
Re-enabled cleanup() an the end of the script.