Remove extra ExpiryDate in affected struct