fixing the cdi loading and weld integration, reducing the dependencies