Removed hardcoded headers