Fixed issue: Cleanup headers