Modified the get_calc_fields function so that it properly respects fields that have been removed from processing.