Cleaned up unnecessary header properties