Cleanup headers implementation
Merge COOK-4623