Remove extra header
Fix dogfooding issues