Remove one more place that does header calculations