Cleanup of comments header