Remove excess useless data points and error functions.
Remove x^2 term, which wasn't doing anything useful. Don't upgrade settings. Only causes problems...
Authored by: azarchs 2015-09-13
Parent: [r15]
Child: [r17]