Remove flattening mappings from interpolation code. Interpolation is now done automatically from findShift methods, instead of as a second step.
cleanup