Adjustments to header cleanup and version stripping