Remove some header stuff