Remove some temp headroom code.