Remove unused includes
Do not use TypeResolver for autodiscovery as this cannot work on CDI injection proxies