CAAERS-6737 remove optional device elements from E2B