Eliminate CalibratedInterval
Eliminate some TEMP methods
Move getAxes() from Dataset to Data
Remove getAxes() workaround