Cdi remove part1

getting rid of a bit CDI....

more to come...