Remove unnecessary fields from E2E structure