Implementation and tests of delete data points (#1). Also come general cleanup and improved consistency.