CDI support and configuration cleanup