remove cdi and add services