Removed CDI stuff