Removed header redundancy