cleanup and simplification in calibration
remove redundant code and deprecated it
experimental: try a new parameter to fix up continuum in filled maps