Header space cleanup