Merge "Remove a stale, unused header"