Cleanup headers implementation