header cleanup and versioning