Begin simplification of Principal

Principal never calls unscheduledFill, it is only called from the UnscheduledProductHolder