simplifying a CDI system